From 93bd129cfb95aefb1fbbfbaeb4da614c95dce1d6 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Fri, 4 Feb 2011 16:05:12 -0300 Subject: The global header for PySide is now installed with the libpyside headers. This is good for PySide derived bindings (like the ones for QtMobility), so they don't need to copy the PySide global headers to their source tree and end up with an outdated file. Reviewed by Hugo Parente Reviewed by Luciano Wolf --- PySide/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'PySide/CMakeLists.txt') diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index 573bd8a6b..ac1529fc9 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -1,12 +1,10 @@ project(pyside) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/private.py" - DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}") include(PySideModules) # Configure include based on platform configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/global.h" @ONLY) + "${CMAKE_CURRENT_BINARY_DIR}/pyside_global.h" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) @@ -38,6 +36,10 @@ HAS_QT_MODULE(QT_PHONON_FOUND phonon) HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative) # install +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/private.py" + DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}") install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml DESTINATION share/PySide${pyside_SUFFIX}/typesystems) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside_global.h + DESTINATION include/${BINDING_NAME}${pyside_SUFFIX}) -- cgit v1.2.3