diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-25 17:47:09 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-25 17:48:29 -0300 |
| commit | ee00f28629745a7b615a0ce6e8c723605e0e1f35 (patch) | |
| tree | 2d58e02ae5bbd255a0c0fe129b61574e8a5a2abe | |
| parent | 9a662a134c6d437edbdc795c00588a249557a0c2 (diff) | |
Fix cmake files used by other projects to detect PySide.
Reviewer: Renato Araújo <renato.filho@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libpyside/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libpyside/PySideConfigVersion.cmake.in (renamed from libpyside/PySideVersion.cmake.in) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d5709520..61a6116eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ endif() find_package(PythonLibs REQUIRED) find_package(PythonInterp REQUIRED) -find_package(Shiboken REQUIRED) +find_package(Shiboken 0.3.3 REQUIRED) find_package(Qt4 4.5.0 REQUIRED) set(BINDING_NAME PySide) diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt index d77502844..efbe1f2b5 100644 --- a/libpyside/CMakeLists.txt +++ b/libpyside/CMakeLists.txt @@ -43,7 +43,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pyside.pc" @ONLY) # create cmake-config files configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySideConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake" @ONLY) install(FILES ${libpyside_HEADERS} DESTINATION include/${BINDING_NAME}) @@ -54,5 +54,5 @@ install(TARGETS pyside EXPORT pyside install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfig.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}") diff --git a/libpyside/PySideVersion.cmake.in b/libpyside/PySideConfigVersion.cmake.in index c64468622..c64468622 100644 --- a/libpyside/PySideVersion.cmake.in +++ b/libpyside/PySideConfigVersion.cmake.in |