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 db2958a6934479249dd1214c047b0c533693a2ac (commit)
via 0368b7463e5302a3bc9ea8fb8b5da03328dc839e (commit)
from 05dbdbca245262d5e5aab0ca12b72cc19f040ee5 (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=db2958a6934479249dd1214c047b0c533693a2ac
commit db2958a6934479249dd1214c047b0c533693a2ac
Merge: 05dbdbc 0368b74
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 28 13:38:03 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 28 13:38:03 2013 -0400
Merge topic 'target-COMPILE_OPTIONS' into next
0368b74 Test with a platform independent define instead of a -f flag.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0368b7463e5302a3bc9ea8fb8b5da03328dc839e
commit 0368b7463e5302a3bc9ea8fb8b5da03328dc839e
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue May 28 19:37:23 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue May 28 19:37:23 2013 +0200
Test with a platform independent define instead of a -f flag.
diff --git a/Tests/CompileOptions/CMakeLists.txt
b/Tests/CompileOptions/CMakeLists.txt
index 75c6f32..6d8a96a 100644
--- a/Tests/CompileOptions/CMakeLists.txt
+++ b/Tests/CompileOptions/CMakeLists.txt
@@ -5,7 +5,7 @@ project(CompileOptions)
add_library(testlib other.cpp)
add_executable(CompileOptions main.cpp)
-set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
"$<$<CXX_COMPILER_ID:GNU>:-fPIE>")
+set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
"$<$<CXX_COMPILER_ID:GNU>:-DTEST_DEFINE>")
target_link_libraries(CompileOptions testlib)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
diff --git a/Tests/CompileOptions/main.cpp b/Tests/CompileOptions/main.cpp
index eec0805..0d39050 100644
--- a/Tests/CompileOptions/main.cpp
+++ b/Tests/CompileOptions/main.cpp
@@ -1,7 +1,7 @@
#ifdef DO_GNU_TESTS
-# ifndef __PIE__
-# error Expected __PIE__
+# ifndef TEST_DEFINE
+# error Expected TEST_DEFINE
# endif
#endif
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileOptions/CMakeLists.txt | 2 +-
Tests/CompileOptions/main.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
