[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1533-g66f05a4
Stephen Kelly
steveire at gmail.com
Thu Jan 10 12:04:57 EST 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 66f05a4a4b061058ecd41bff01950b168b997e3a (commit)
via 93034a8350102e308fa5bca8d89bf3f6fae12771 (commit)
from 809f8312515e9dd7aef4c93d87d243532b255dbd (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=66f05a4a4b061058ecd41bff01950b168b997e3a
commit 66f05a4a4b061058ecd41bff01950b168b997e3a
Merge: 809f831 93034a8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 12:04:54 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 10 12:04:54 2013 -0500
Merge topic 'fix-imported-lib-linking-test' into next
93034a8 Fix linking to imported libraries test.
diff --cc Tests/ExportImport/Import/A/deps_iface.c
index c0d9735,e73ca26..91c42fe
--- a/Tests/ExportImport/Import/A/deps_iface.c
+++ b/Tests/ExportImport/Import/A/deps_iface.c
@@@ -20,9 -18,7 +20,9 @@@
extern int testLibDepends(void);
- int main(int,char **)
+ int main()
{
- return testLibDepends();
+ TestLibLibraryRequired ifaceDep;
+
+ return testLibDepends() + ifaceDep.foo();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93034a8350102e308fa5bca8d89bf3f6fae12771
commit 93034a8350102e308fa5bca8d89bf3f6fae12771
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 10 17:11:12 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 10 17:13:19 2013 +0100
Fix linking to imported libraries test.
Make a C executable instead of attempting to make a C++ static
library (and not really succeeding). This was introduced in
commit 894f52f3 (Handle INTERFACE properties transitively for
includes and defines., 2012-09-23).
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index b77562e..56cfea0 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -157,8 +157,8 @@ endif()
# Test that dependent imported targets have usable
# INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES
-add_library(deps_iface deps_iface.cpp)
-target_link_libraries(deps_iface testLibsDepends)
+add_executable(deps_iface deps_iface.c)
+target_link_libraries(deps_iface testLibDepends)
set_property(TARGET deps_iface APPEND PROPERTY
COMPILE_DEFINITIONS
$<TARGET_PROPERTY:testLibDepends,INTERFACE_COMPILE_DEFINITIONS>
diff --git a/Tests/ExportImport/Import/A/deps_iface.cpp b/Tests/ExportImport/Import/A/deps_iface.c
similarity index 94%
rename from Tests/ExportImport/Import/A/deps_iface.cpp
rename to Tests/ExportImport/Import/A/deps_iface.c
index 7190b92..e73ca26 100644
--- a/Tests/ExportImport/Import/A/deps_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_iface.c
@@ -18,7 +18,7 @@
extern int testLibDepends(void);
-int main(int,char **)
+int main()
{
return testLibDepends();
}
-----------------------------------------------------------------------
Summary of changes:
Tests/ExportImport/Import/A/CMakeLists.txt | 4 ++--
.../Import/A/{deps_iface.cpp => deps_iface.c} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename Tests/ExportImport/Import/A/{deps_iface.cpp => deps_iface.c} (95%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list