[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-710-g26d88d3

[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  26d88d323f21fa292b6a2990f3522e7f87ff0787 (commit)
       via  7998915e3bf8aa18940d488ec3238b195615723a (commit)
       via  003099bc92fd3f0cdd97e7524900f28a84db2a5a (commit)
      from  fbde295974f8dd6a04bde1a48e2cd43034b3af98 (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=26d88d323f21fa292b6a2990f3522e7f87ff0787
commit 26d88d323f21fa292b6a2990f3522e7f87ff0787
Merge: fbde295 7998915
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Sat Jun 27 17:33:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 27 17:33:06 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    7998915e Handle sub directory libraries with export all dll and add a test for it.
    003099bc Do not use iostream because some older compilers get it wrong.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7998915e3bf8aa18940d488ec3238b195615723a
commit 7998915e3bf8aa18940d488ec3238b195615723a
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Sat Jun 27 17:32:05 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Sat Jun 27 17:32:05 2015 -0400

    Handle sub directory libraries with export all dll and add a test for it.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index bdc3c98..7a8ac86 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -893,7 +893,8 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
   std::string const& configName)
 {
   std::vector<std::string> outputs;
-  std::string deffile = "$(IntDir)/exportall.def";
+  std::string deffile = gt->ObjectDirectory;
+  deffile += "/exportall.def";
   outputs.push_back(deffile);
   std::vector<std::string> empty;
   std::vector<cmSourceFile const*> objectSources;
@@ -914,8 +915,11 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
   cmdl.push_back("-E");
   cmdl.push_back("__create_def");
   cmdl.push_back(deffile);
-  std::string objs_file = gt->Target->GetName();
-  objs_file += ".dir/" + configName;
+  std::string obj_dir_expanded = obj_dir;
+  cmSystemTools::ReplaceString(obj_dir_expanded,
+                               this->GetCMakeCFGIntDir(),
+                               configName.c_str());
+  std::string objs_file = obj_dir_expanded;
   cmSystemTools::MakeDirectory(objs_file.c_str());
   objs_file += "/objects.txt";
   cmdl.push_back(objs_file);
diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
index c426f66..3b2b2c5 100644
--- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake
+++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
@@ -1,5 +1,7 @@
 project(autoexport)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${autoexport_BINARY_DIR}/bin)
+add_subdirectory(sub)
 add_library(autoexport SHARED hello.cxx world.cxx foo.c)
 add_executable(say say.cxx)
-target_link_libraries(say autoexport)
+target_link_libraries(say autoexport autoexport2)
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index 8a2a174..3784a6a 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -23,4 +23,4 @@ if(WIN32)
   set(EXE_EXT ".exe")
 endif()
 run_cmake_command(AutoExportRun
-  ${RunCMake_BINARY_DIR}/AutoExport-build/${INTDIR}say${EXE_EXT})
+  ${RunCMake_BINARY_DIR}/AutoExport-build/bin/${INTDIR}say${EXE_EXT})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=003099bc92fd3f0cdd97e7524900f28a84db2a5a
commit 003099bc92fd3f0cdd97e7524900f28a84db2a5a
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Sat Jun 27 17:24:21 2015 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Sat Jun 27 17:24:21 2015 -0400

    Do not use iostream because some older compilers get it wrong.

diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx
index ad83420..3933fc1 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -1,4 +1,4 @@
-#include <iostream>
+#include <stdio.h>
 #include "hello.h"
 int Hello::Data = 0;
 void Hello::real()
@@ -7,7 +7,7 @@ void Hello::real()
 }
 void hello()
 {
-  std::cout << "hello";
+  printf("hello");
 }
 void Hello::operator delete[](void*) {};
 void Hello::operator delete(void*) {};
diff --git a/Tests/RunCMake/AutoExportDll/world.cxx b/Tests/RunCMake/AutoExportDll/world.cxx
index 8107949..3a54df3 100644
--- a/Tests/RunCMake/AutoExportDll/world.cxx
+++ b/Tests/RunCMake/AutoExportDll/world.cxx
@@ -1,6 +1,6 @@
-#include <iostream>
+#include "stdio.h"
 
 void world()
 {
-  std::cout << "world";
+  printf("world");
 }

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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx        |   10 +++++++---
 Tests/RunCMake/AutoExportDll/AutoExport.cmake   |    4 +++-
 Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake |    2 +-
 Tests/RunCMake/AutoExportDll/hello.cxx          |    4 ++--
 Tests/RunCMake/AutoExportDll/world.cxx          |    4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake