[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-707-gfbde295

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  fbde295974f8dd6a04bde1a48e2cd43034b3af98 (commit)
       via  8ccdfb754a5f3b4c74b7725677bf0900785fa47d (commit)
      from  24fad5b0f0ddd90bd6fd6c47e263527e99299dd3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbde295974f8dd6a04bde1a48e2cd43034b3af98
commit fbde295974f8dd6a04bde1a48e2cd43034b3af98
Merge: 24fad5b 8ccdfb7
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 26 16:49:26 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 16:49:26 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    8ccdfb75 Add clean to the export test and change the obj list name to avoid removal.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ccdfb754a5f3b4c74b7725677bf0900785fa47d
commit 8ccdfb754a5f3b4c74b7725677bf0900785fa47d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 26 16:48:57 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jun 26 16:48:57 2015 -0400

    Add clean to the export test and change the obj list name to avoid removal.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 61cec6c..bdc3c98 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -917,7 +917,7 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
   std::string objs_file = gt->Target->GetName();
   objs_file += ".dir/" + configName;
   cmSystemTools::MakeDirectory(objs_file.c_str());
-  objs_file += "/exportall.def.objs";
+  objs_file += "/objects.txt";
   cmdl.push_back(objs_file);
   std::ofstream fout(objs_file.c_str());
   if(!fout)
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 03acf2f..024a1c5 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2473,7 +2473,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     const char *autodef = this->Target->GetProperty(autodef_prop);
     if (autodef && *autodef)
       {
-      linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
+      linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
       }
     }
 
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index f4e08ec..8a2a174 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -17,7 +17,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode")
 endif()
 # build AutoExport
 run_cmake_command(AutoExportBuild ${CMAKE_COMMAND} --build
-  ${RunCMake_TEST_BINARY_DIR} --config Debug)
+  ${RunCMake_TEST_BINARY_DIR} --config Debug --clean-first)
 # run the executable that uses symbols from the dll
 if(WIN32)
   set(EXE_EXT ".exe")

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx        |    2 +-
 Source/cmVisualStudio10TargetGenerator.cxx      |    2 +-
 Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake