aboutsummaryrefslogtreecommitdiffstats
path: root/libshiboken
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2010-02-24 17:02:22 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-02-24 17:21:38 -0300
commitdb98871a87cf4c74f4e54b1b7185edf9ad0c0db4 (patch)
tree1d6dbe8b3ce490b2e3afdbda4448ede3eeccf0d2 /libshiboken
parent96301fc2ee0659b2fd04db259c7440291c3361cd (diff)
Remove FindShiboken.cmake file in favor of ShibokenConfig and Version .cmake files.
This is the right way to go, according to: - http://www.cmake.org/pipermail/cmake/2009-April/028504.html - http://www.cmake.org/Wiki/CMake_2.6_Notes#Packages Reviewed by Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'libshiboken')
-rw-r--r--libshiboken/CMakeLists.txt25
-rw-r--r--libshiboken/FindShiboken.cmake.in13
-rw-r--r--libshiboken/ShibokenConfig.cmake.in5
-rw-r--r--libshiboken/ShibokenVersion.cmake.in9
4 files changed, 31 insertions, 21 deletions
diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt
index 3cc0a5618..f2b2927b0 100644
--- a/libshiboken/CMakeLists.txt
+++ b/libshiboken/CMakeLists.txt
@@ -3,11 +3,18 @@ project(libshiboken)
find_package(PythonLibs REQUIRED)
set(libshiboken_VERSION 0.1)
+set(libshiboken_MAJOR_VERSION "0")
+set(libshiboken_MINOR_VERSION "1")
+set(libshiboken_MICRO_VERSION "0")
+set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}.${libshiboken_MICRO_VERSION}")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindShiboken.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/FindShiboken.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc @ONLY)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenVersion.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/ShibokenVersion.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc" @ONLY)
set(libshiboken_SRC
basewrapper.cpp
@@ -29,9 +36,11 @@ install(DIRECTORY . DESTINATION include/shiboken
FILES_MATCHING PATTERN "*.h"
PATTERN ".git" EXCLUDE
)
-install(TARGETS libshiboken DESTINATION ${LIB_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindShiboken.cmake
- DESTINATION "share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc
+install(TARGETS libshiboken DESTINATION "${LIB_INSTALL_DIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${libshiboken_VERSION}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenVersion.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${libshiboken_VERSION}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc"
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
diff --git a/libshiboken/FindShiboken.cmake.in b/libshiboken/FindShiboken.cmake.in
deleted file mode 100644
index e63310dc8..000000000
--- a/libshiboken/FindShiboken.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# - try to find Shiboken
-# SHIBOKEN_INCLUDE_DIR - Directories to include to use Shiboken
-# SHIBOKEN_LIBRARIES - Files to link against to use Shiboken
-# SHIBOKEN_FOUND - Shiboken was found
-
-find_path(SHIBOKEN_INCLUDE_DIR shiboken.h @CMAKE_INSTALL_PREFIX@/include/shiboken)
-find_library(SHIBOKEN_LIBRARY shiboken @CMAKE_INSTALL_PREFIX@/lib)
-
-set(SHIBOKEN_FOUND "NO")
-if(SHIBOKEN_LIBRARY AND SHIBOKEN_INCLUDE_DIR)
- set(SHIBOKEN_FOUND "YES")
-endif(SHIBOKEN_LIBRARY AND SHIBOKEN_INCLUDE_DIR)
-
diff --git a/libshiboken/ShibokenConfig.cmake.in b/libshiboken/ShibokenConfig.cmake.in
new file mode 100644
index 000000000..88e35eae6
--- /dev/null
+++ b/libshiboken/ShibokenConfig.cmake.in
@@ -0,0 +1,5 @@
+# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
+# SHIBOKEN_LIBRARIES - Files to link against to use SHIBOKEN
+
+SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken")
+SET(SHIBOKEN_LIBRARY "shiboken")
diff --git a/libshiboken/ShibokenVersion.cmake.in b/libshiboken/ShibokenVersion.cmake.in
new file mode 100644
index 000000000..c29b249d4
--- /dev/null
+++ b/libshiboken/ShibokenVersion.cmake.in
@@ -0,0 +1,9 @@
+set(PACKAGE_VERSION @libshiboken_VERSION@)
+if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @libshiboken_MAJOR_VERSION@)
+ if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @libshiboken_MINOR_VERSION@)
+ set(PACKAGE_VERSION_COMPATIBLE 1)
+ if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @libshiboken_MICRO_VERSION@)
+ set(PACKAGE_VERSION_EXACT 1)
+ endif()
+ endif()
+endif()