[Cmake-commits] CMake branch, next, updated. v2.8.12-4214-g51e5088
Stephen Kelly
steveire at gmail.com
Mon Oct 21 09:56:22 EDT 2013
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 51e5088fd8a56be26d11cac5c2466f27acec69fa (commit)
via 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d (commit)
from 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 (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=51e5088fd8a56be26d11cac5c2466f27acec69fa
commit 51e5088fd8a56be26d11cac5c2466f27acec69fa
Merge: 24146bf 7f177a8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 21 09:56:20 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 21 09:56:20 2013 -0400
Merge topic 'double-colon-is-imported' into next
7f177a8 Don't create a try_compile test with :: in the name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
commit 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 21 15:54:24 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 21 15:54:24 2013 +0200
Don't create a try_compile test with :: in the name
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index e31031c..cf7e2bc 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CheckCXXSourceCompiles)
macro(do_try_compile prefix)
- set(CMAKE_REQUIRED_LIBRARIES ${prefix}headeronly)
+ set(CMAKE_REQUIRED_LIBRARIES ${prefix}::headeronly)
check_cxx_source_compiles(
"
#include \"headeronly.h\"
@@ -42,7 +42,7 @@ macro(do_try_compile prefix)
endif()
endmacro()
-do_try_compile(bld::)
+do_try_compile(bld)
add_executable(headeronlytest_exp headeronlytest.cpp)
target_link_libraries(headeronlytest_exp exp::headeronly)
@@ -52,4 +52,4 @@ set_property(TARGET exp::sharediface APPEND PROPERTY INTERFACE_LINK_LIBRARIES de
add_executable(interfacetest_exp interfacetest.cpp)
target_link_libraries(interfacetest_exp exp::sharediface)
-do_try_compile(exp::)
+do_try_compile(exp)
-----------------------------------------------------------------------
Summary of changes:
Tests/ExportImport/Import/Interface/CMakeLists.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list