[Cmake-commits] CMake branch, next, updated. v2.8.11-2569-gd9f1bf7

[Stephen Kelly]

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  d9f1bf72100a3d362922e6be1a11ddab71cdf3cb (commit)
       via  f236ef91ce51b06b111c419cb059f84d4652d2ca (commit)
      from  541c5eaa50d1be5ff17940d7de6b9b0f71da65db (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=d9f1bf72100a3d362922e6be1a11ddab71cdf3cb
commit d9f1bf72100a3d362922e6be1a11ddab71cdf3cb
Merge: 541c5ea f236ef9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 6 14:17:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 6 14:17:17 2013 -0400

    Merge topic 'INTERFACE_LINK_LIBRARIES-prop' into next
    
    f236ef9 Generate an export header.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f236ef91ce51b06b111c419cb059f84d4652d2ca
commit f236ef91ce51b06b111c419cb059f84d4652d2ca
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 6 20:12:44 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 6 20:16:08 2013 +0200

    Generate an export header.

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index c74dc9a..a9720e7 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -229,8 +229,11 @@ target_link_libraries(testSharedLibDepends LINK_INTERFACE_LIBRARIES
   $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:$<TARGET_NAME:testSharedLibRequired>>)
 
 add_library(cmp0022OLD SHARED cmp0022.cpp)
+generate_export_header(cmp0022OLD BASE_NAME cmp0022)
+target_include_directories(cmp0022OLD PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>")
 cmake_policy(SET CMP0022 NEW)
 add_library(cmp0022NEW SHARED cmp0022.cpp)
+target_include_directories(cmp0022NEW PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>")
 cmake_policy(SET CMP0022 OLD)
 
 set_property(TARGET testLib2 APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USING_TESTLIB2)
diff --git a/Tests/ExportImport/Export/cmp0022.cpp b/Tests/ExportImport/Export/cmp0022.cpp
index 5b36ccb..bef8e61 100644
--- a/Tests/ExportImport/Export/cmp0022.cpp
+++ b/Tests/ExportImport/Export/cmp0022.cpp
@@ -1,4 +1,6 @@
 
+#include "cmp0022.h"
+
 int cmp0022()
 {
   return 0;
diff --git a/Tests/ExportImport/Export/cmp0022.h b/Tests/ExportImport/Export/cmp0022.h
index a9f6819..32bf71a 100644
--- a/Tests/ExportImport/Export/cmp0022.h
+++ b/Tests/ExportImport/Export/cmp0022.h
@@ -1,5 +1,4 @@
 
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int cmp0022();
+#include "cmp0022_export.h"
+
+int CMP0022_EXPORT cmp0022();

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt |    3 +++
 Tests/ExportImport/Export/cmp0022.cpp    |    2 ++
 Tests/ExportImport/Export/cmp0022.h      |    7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake