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 c9b5e0bf3636a339aaf06d98c5d3267f928c19c8 (commit)
via d252d6c61e04e7d90d48ec5a78cb9489d0dca28a (commit)
from 6da6fa0023c4aa0a93a6d073bd13c7f343684126 (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=c9b5e0bf3636a339aaf06d98c5d3267f928c19c8
commit c9b5e0bf3636a339aaf06d98c5d3267f928c19c8
Merge: 6da6fa0 d252d6c
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Dec 13 08:34:53 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Dec 13 08:34:53 2013 -0500
Merge topic 'GenerateExportHeader-tests' into next
d252d6c Use variables.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d252d6c61e04e7d90d48ec5a78cb9489d0dca28a
commit d252d6c61e04e7d90d48ec5a78cb9489d0dca28a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Dec 13 14:32:37 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Dec 13 14:32:37 2013 +0100
Use variables.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 73ad5e3..5c54cc9 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -185,17 +185,19 @@ add_executable(GenerateExportHeader exportheader_test.cpp)
target_link_libraries(GenerateExportHeader ${link_libraries})
if (WIN32)
- if(MSVC)
+ if(MSVC AND COMPILER_HAS_DEPRECATED)
set(_platform Win32)
- elseif(MINGW)
+ elseif(MINGW AND COMPILER_HAS_DEPRECATED)
set(_platform MinGW)
else()
set(_platform WinEmpty)
endif()
-elseif(NOT USE_COMPILER_HIDDEN_VISIBILITY)
- set(_platform Empty)
-else()
+elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
set(_platform UNIX)
+elseif(COMPILER_HAS_DEPRECATED)
+ set(_platform UNIX_DeprecatedOnly)
+else()
+ set(_platform Empty)
endif()
message("#### Testing reference: ${_platform}")
target_compile_definitions(GenerateExportHeader
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/GenerateExportHeader/CMakeLists.txt | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
