diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-23 16:55:46 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-23 17:16:29 -0300 |
| commit | 516bdb49bbfdbd5ff916c1c5aa3997e830818933 (patch) | |
| tree | 3f3df0e6e5e687a71c9a14a0a1aee2f581ecfcda | |
| parent | d6fe9d4e6b62ceaab016611b7f68bfadcc0d29a5 (diff) | |
Fix cmake files used by other projects to detect Shiboken.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libshiboken/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libshiboken/ShibokenConfigVersion.cmake.in (renamed from libshiboken/ShibokenVersion.cmake.in) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 220d1770d..6f5609151 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(shiboken) cmake_minimum_required(VERSION 2.6) find_package(Qt4 4.5.0 REQUIRED) -find_package(ApiExtractor REQUIRED) -find_package(GeneratorRunner REQUIRED) +find_package(ApiExtractor 0.6.1 REQUIRED) +find_package(GeneratorRunner 0.5 REQUIRED) add_definitions(${QT_DEFINITIONS}) diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt index 73d31afd8..4571a4cf7 100644 --- a/libshiboken/CMakeLists.txt +++ b/libshiboken/CMakeLists.txt @@ -19,8 +19,8 @@ set(libshiboken_SOVERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERS 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}/ShibokenConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc" @ONLY) @@ -69,7 +69,7 @@ install(FILES 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" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.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/ShibokenVersion.cmake.in b/libshiboken/ShibokenConfigVersion.cmake.in index c29b249d4..c29b249d4 100644 --- a/libshiboken/ShibokenVersion.cmake.in +++ b/libshiboken/ShibokenConfigVersion.cmake.in |