[Cmake-commits] CMake branch, next, updated. v2.8.6-1505-g021cece

Stephen Kelly steveire at gmail.com
Wed Oct 5 09:52:46 EDT 2011


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  021cece31b7fc461940fe605252a4958ded66ac5 (commit)
       via  67ae66aa918ba62ebb2010f01c98574ddc1cf2d5 (commit)
      from  1ee556b5d5e66faff366b2aad8fdff142204dc8b (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=021cece31b7fc461940fe605252a4958ded66ac5
commit 021cece31b7fc461940fe605252a4958ded66ac5
Merge: 1ee556b 67ae66a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 09:52:38 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 09:52:38 2011 -0400

    Merge topic 'cmake-link-interface-libraries' into next
    
    67ae66a Export symbols from the test libraries.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67ae66aa918ba62ebb2010f01c98574ddc1cf2d5
commit 67ae66aa918ba62ebb2010f01c98574ddc1cf2d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 5 15:51:46 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 5 15:51:46 2011 +0200

    Export symbols from the test libraries.
    
    Hopefully fix continuous builds.

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 8a06cf0..b7bb42f 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -51,6 +51,10 @@ macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES SPECIFY_LINK_INTERFACE_LIBRARIES)
     "add_library(libB SHARED classB.cpp)\n"
     "add_library(libC SHARED classC.cpp)\n"
 
+    "generate_export_header(libA)\n"
+    "generate_export_header(libB)\n"
+    "generate_export_header(libC)\n"
+
     "add_executable(exec \"${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp\")\n"
   )
 
diff --git a/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
index a9332e9..22e6b29 100644
--- a/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(src)
 
 include(CheckCXXCompilerFlag)
+include(GenerateExportHeader)
 
 check_cxx_compiler_flag(-Wl,--no-undefined HAS_NO_UNDEFINED)
 
diff --git a/Tests/CMakeCommands/target_link_libraries/src/classA.h b/Tests/CMakeCommands/target_link_libraries/src/classA.h
index d485489..0a83f88 100644
--- a/Tests/CMakeCommands/target_link_libraries/src/classA.h
+++ b/Tests/CMakeCommands/target_link_libraries/src/classA.h
@@ -2,7 +2,9 @@
 #ifndef CLASS_A_H
 #define CLASS_A_H
 
-class classA
+#include "liba_export.h"
+
+class LIBA_EXPORT classA
 {
 public:
   classA();
diff --git a/Tests/CMakeCommands/target_link_libraries/src/classB.h b/Tests/CMakeCommands/target_link_libraries/src/classB.h
index 7c2ad47..81e83fe 100644
--- a/Tests/CMakeCommands/target_link_libraries/src/classB.h
+++ b/Tests/CMakeCommands/target_link_libraries/src/classB.h
@@ -2,9 +2,11 @@
 #ifndef CLASS_B_H
 #define CLASS_B_H
 
+#include "libb_export.h"
+
 class classA;
 
-class classB
+class LIBB_EXPORT classB
 {
 public:
   classB();
diff --git a/Tests/CMakeCommands/target_link_libraries/src/classC.h b/Tests/CMakeCommands/target_link_libraries/src/classC.h
index 5d8a931..8dc929e 100644
--- a/Tests/CMakeCommands/target_link_libraries/src/classC.h
+++ b/Tests/CMakeCommands/target_link_libraries/src/classC.h
@@ -2,9 +2,11 @@
 #ifndef CLASS_C_H
 #define CLASS_C_H
 
+#include "libc_export.h"
+
 class classA;
 
-class classC
+class LIBC_EXPORT classC
 {
 public:
   classC();

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

Summary of changes:
 .../target_link_libraries/CMakeLists.txt           |    4 ++++
 .../target_link_libraries/src/CMakeLists.txt       |    1 +
 .../target_link_libraries/src/classA.h             |    4 +++-
 .../target_link_libraries/src/classB.h             |    4 +++-
 .../target_link_libraries/src/classC.h             |    4 +++-
 5 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list