[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1792-g87aad47
Stephen Kelly
steveire at gmail.com
Wed Feb 26 16:21:39 EST 2014
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 87aad47f293ccb7358e5e9e8cd854e9bd710d26f (commit)
via 0bba365ff5423fc51d574d17b7934e3a0148ac2e (commit)
from 5745be7e2b813a81f0c4c36b2d6865dba26c8a56 (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=87aad47f293ccb7358e5e9e8cd854e9bd710d26f
commit 87aad47f293ccb7358e5e9e8cd854e9bd710d26f
Merge: 5745be7 0bba365
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 26 16:21:38 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 16:21:38 2014 -0500
Merge topic 'test-find_dependency' into next
0bba365f Add test for find_dependency macro.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bba365ff5423fc51d574d17b7934e3a0148ac2e
commit 0bba365ff5423fc51d574d17b7934e3a0148ac2e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 26 21:30:18 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 26 22:21:03 2014 +0100
Add test for find_dependency macro.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8074a01..c414850 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -381,6 +381,7 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Module/ExternalData")
ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
+ ADD_TEST_MACRO(Module.FindDependency FindDependency)
if (APPLE OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
include(CheckCXXCompilerFlag)
diff --git a/Tests/Module/FindDependency/CMakeLists.txt b/Tests/Module/FindDependency/CMakeLists.txt
new file mode 100644
index 0000000..b13f48a
--- /dev/null
+++ b/Tests/Module/FindDependency/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+cmake_minimum_required(VERSION 3.0)
+project(FindDependency)
+
+set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/packages")
+
+find_package(Pack1 REQUIRED)
+
+add_executable(FindDependency main.cpp)
+target_link_libraries(FindDependency Pack1::Lib)
diff --git a/Tests/Module/FindDependency/main.cpp b/Tests/Module/FindDependency/main.cpp
new file mode 100644
index 0000000..d635b31
--- /dev/null
+++ b/Tests/Module/FindDependency/main.cpp
@@ -0,0 +1,17 @@
+
+#ifndef HAVE_PACK1
+#error Expected HAVE_PACK1
+#endif
+
+#ifndef HAVE_PACK2
+#error Expected HAVE_PACK2
+#endif
+
+#ifndef HAVE_PACK3
+#error Expected HAVE_PACK3
+#endif
+
+int main(int argc, char** argv)
+{
+ return 0;
+}
diff --git a/Tests/Module/FindDependency/packages/Pack1/Pack1Config.cmake b/Tests/Module/FindDependency/packages/Pack1/Pack1Config.cmake
new file mode 100644
index 0000000..ff533c2
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack1/Pack1Config.cmake
@@ -0,0 +1,9 @@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(Pack2 2.3)
+find_dependency(Pack3)
+
+add_library(Pack1::Lib INTERFACE IMPORTED)
+set_property(TARGET Pack1::Lib PROPERTY INTERFACE_COMPILE_DEFINITIONS HAVE_PACK1)
+set_property(TARGET Pack1::Lib PROPERTY INTERFACE_LINK_LIBRARIES Pack2::Lib Pack3::Lib)
diff --git a/Tests/Module/FindDependency/packages/Pack1/Pack1ConfigVersion.cmake b/Tests/Module/FindDependency/packages/Pack1/Pack1ConfigVersion.cmake
new file mode 100644
index 0000000..dfb7b6c
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack1/Pack1ConfigVersion.cmake
@@ -0,0 +1,11 @@
+
+set(PACKAGE_VERSION "1.3")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
diff --git a/Tests/Module/FindDependency/packages/Pack2/Pack2Config.cmake b/Tests/Module/FindDependency/packages/Pack2/Pack2Config.cmake
new file mode 100644
index 0000000..672288e
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack2/Pack2Config.cmake
@@ -0,0 +1,5 @@
+
+set(PACK2_VAR ON)
+
+add_library(Pack2::Lib INTERFACE IMPORTED)
+set_property(TARGET Pack2::Lib PROPERTY INTERFACE_COMPILE_DEFINITIONS HAVE_PACK2)
diff --git a/Tests/Module/FindDependency/packages/Pack2/Pack2ConfigVersion.cmake b/Tests/Module/FindDependency/packages/Pack2/Pack2ConfigVersion.cmake
new file mode 100644
index 0000000..42f58c0
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack2/Pack2ConfigVersion.cmake
@@ -0,0 +1,11 @@
+
+set(PACKAGE_VERSION "2.4")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
diff --git a/Tests/Module/FindDependency/packages/Pack3/Pack3Config.cmake b/Tests/Module/FindDependency/packages/Pack3/Pack3Config.cmake
new file mode 100644
index 0000000..25c32f3
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack3/Pack3Config.cmake
@@ -0,0 +1,5 @@
+
+set(PACK3_VAR ON)
+
+add_library(Pack3::Lib INTERFACE IMPORTED)
+set_property(TARGET Pack3::Lib PROPERTY INTERFACE_COMPILE_DEFINITIONS HAVE_PACK3)
diff --git a/Tests/Module/FindDependency/packages/Pack3/Pack3ConfigVersion.cmake b/Tests/Module/FindDependency/packages/Pack3/Pack3ConfigVersion.cmake
new file mode 100644
index 0000000..870f747
--- /dev/null
+++ b/Tests/Module/FindDependency/packages/Pack3/Pack3ConfigVersion.cmake
@@ -0,0 +1,11 @@
+
+set(PACKAGE_VERSION "1.4")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 1 +
Tests/Module/FindDependency/CMakeLists.txt | 10 ++++++++++
Tests/Module/FindDependency/main.cpp | 17 +++++++++++++++++
.../FindDependency/packages/Pack1/Pack1Config.cmake | 9 +++++++++
.../packages/Pack1/Pack1ConfigVersion.cmake | 11 +++++++++++
.../FindDependency/packages/Pack2/Pack2Config.cmake | 5 +++++
.../packages/Pack2/Pack2ConfigVersion.cmake | 11 +++++++++++
.../FindDependency/packages/Pack3/Pack3Config.cmake | 5 +++++
.../packages/Pack3/Pack3ConfigVersion.cmake | 11 +++++++++++
9 files changed, 80 insertions(+)
create mode 100644 Tests/Module/FindDependency/CMakeLists.txt
create mode 100644 Tests/Module/FindDependency/main.cpp
create mode 100644 Tests/Module/FindDependency/packages/Pack1/Pack1Config.cmake
create mode 100644 Tests/Module/FindDependency/packages/Pack1/Pack1ConfigVersion.cmake
create mode 100644 Tests/Module/FindDependency/packages/Pack2/Pack2Config.cmake
create mode 100644 Tests/Module/FindDependency/packages/Pack2/Pack2ConfigVersion.cmake
create mode 100644 Tests/Module/FindDependency/packages/Pack3/Pack3Config.cmake
create mode 100644 Tests/Module/FindDependency/packages/Pack3/Pack3ConfigVersion.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list