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 89af01e7740440b8ac12a5f983dae93b34911482 (commit)
via 08271ec7d3184c8a53ae80be9ec0ac6438032cfa (commit)
via c83cfd7a01f2fb00ba7d545b0df667c0d43b296f (commit)
via 48171cefb5bc4a52953b08ade9459584fddc3d0d (commit)
via 783da62f2ea539fa5baf96bb28f7f6690f748229 (commit)
via 61c69d3fbbdb0390eb8f27e39a30a21d43ab4169 (commit)
from 64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d (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=89af01e7740440b8ac12a5f983dae93b34911482
commit 89af01e7740440b8ac12a5f983dae93b34911482
Merge: 64c1dcc 08271ec
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Oct 10 10:39:45 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 10 10:39:45 2011 -0400
Merge topic 'export-header-tests' into next
08271ec Build each library only once instead of once for each test.
c83cfd7 Remove unused define.
48171ce KWSys Nightly Date Stamp
783da62 KWSys Nightly Date Stamp
61c69d3 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08271ec7d3184c8a53ae80be9ec0ac6438032cfa
commit 08271ec7d3184c8a53ae80be9ec0ac6438032cfa
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Oct 9 17:41:47 2011 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Oct 9 17:41:47 2011 +0200
Build each library only once instead of once for each test.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 7a52c71..4a5b1cb 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -55,6 +55,29 @@ else()
endif()
endif()
+set(DEPS
+ libshared
+ libstatic
+ lib_shared_and_static
+)
+
+foreach(DEP ${DEPS})
+ try_compile(Result ${CMAKE_CURRENT_BINARY_DIR}/${DEP}_build
+ ${CMAKE_CURRENT_SOURCE_DIR}/${DEP}
+ ${DEP}
+ OUTPUT_VARIABLE Out
+ )
+ if (NOT Result)
+ message("OUTPUT: ${Out}")
+ endif()
+endforeach()
+
+# The _do_build macro is called from a child scope, where
+# the current source and binary dir are different. Save them here
+# for use in the macro.
+set(TEST_TOP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(TEST_TOP_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
# We seem to get race conditions is writing this stuff to the same file at
least on MinGW
# So to write to separate source and build directories, we use a count to
differentiate.
@@ -67,8 +90,6 @@ macro(_do_build Include Library LibrarySource Source)
"int main() { ${Source}; }\n"
)
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../${LibrarySource}" DESTINATION
"${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}")
-
if ("${Library}" STREQUAL "static_variant")
set(CONDITIONAL_STATIC_DEFINE
"add_definitions(-DLIBSHARED_AND_STATIC_STATIC_DEFINE)\n")
endif()
@@ -90,9 +111,10 @@ macro(_do_build Include Library LibrarySource Source)
" add_definitions(${ERROR_FLAG})\n"
"endif()\n"
- "add_subdirectory(\"${LibrarySource}\")\n"
+
"include(\"${TEST_TOP_BINARY_DIR}/${LibrarySource}_build/Targets.cmake\")\n"
- "include_directories(\"${LibrarySource}\"
\"\${CMAKE_CURRENT_BINARY_DIR}/${LibrarySource}\")\n"
+ "include_directories(\"${TEST_TOP_SOURCE_DIR}/${LibrarySource}\"\n"
+ " \"${TEST_TOP_BINARY_DIR}/${LibrarySource}_build\")\n"
"${CONDITIONAL_STATIC_DEFINE}"
diff --git
a/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
index d19b6dc..be0387f 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
@@ -1,4 +1,13 @@
-project(shared_and_static)
+
+cmake_minimum_required(VERSION 2.8)
+
+project(lib_shared_and_static)
+
+include(GenerateExportHeader)
+
+add_compiler_export_flags()
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(lib_SRCS
libshared_and_static.cpp
@@ -10,3 +19,5 @@ add_library(static_variant ${lib_SRCS})
generate_export_header(shared_variant BASE_NAME libshared_and_static)
set_target_properties(static_variant PROPERTIES COMPILE_FLAGS
-DLIBSHARED_AND_STATIC_STATIC_DEFINE)
+
+export(TARGETS shared_variant static_variant FILE Targets.cmake)
diff --git a/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
index 8e4ee2b..e20adb1 100644
--- a/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
@@ -1,6 +1,16 @@
+cmake_minimum_required(VERSION 2.8)
+
project(libshared)
+include(GenerateExportHeader)
+
+add_compiler_export_flags()
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
add_library(libshared SHARED libshared.cpp)
generate_export_header(libshared)
+
+export(TARGETS libshared FILE Targets.cmake)
diff --git a/Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt
index 8db1827..b2db3ea 100644
--- a/Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt
@@ -1,8 +1,18 @@
+cmake_minimum_required(VERSION 2.8)
+
project(libstatic)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+include(GenerateExportHeader)
+
+add_compiler_export_flags()
+
# Show that the export header has no effect on a static library.
add_library(libstatic STATIC libstatic.cpp)
generate_export_header(libstatic)
+
+export(TARGETS libstatic FILE Targets.cmake)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c83cfd7a01f2fb00ba7d545b0df667c0d43b296f
commit c83cfd7a01f2fb00ba7d545b0df667c0d43b296f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Oct 9 17:39:24 2011 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Oct 9 17:39:24 2011 +0200
Remove unused define.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 3edb548..7a52c71 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -90,10 +90,6 @@ macro(_do_build Include Library LibrarySource Source)
" add_definitions(${ERROR_FLAG})\n"
"endif()\n"
- "if(MSVC)\n"
- " add_definitions(-DCOMPILER_IS_MSVC)\n"
- "endif()\n"
-
"add_subdirectory(\"${LibrarySource}\")\n"
"include_directories(\"${LibrarySource}\"
\"\${CMAKE_CURRENT_BINARY_DIR}/${LibrarySource}\")\n"
@@ -125,10 +121,6 @@ include(GenerateExportHeader)
add_compiler_export_flags()
-if (MSVC)
- add_definitions(-DCOMPILER_IS_MSVC)
-endif()
-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
message("#### COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/kwsysDateStamp.cmake | 2 +-
Tests/Module/GenerateExportHeader/CMakeLists.txt | 38 +++++++++++++------
.../lib_shared_and_static/CMakeLists.txt | 13 ++++++-
.../GenerateExportHeader/libshared/CMakeLists.txt | 10 +++++
.../GenerateExportHeader/libstatic/CMakeLists.txt | 10 +++++
5 files changed, 59 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
