GIT_REPOSITORIES/LPP/PythonQt Commit - r213:89db53e7cd3e

More PythonQt*Config.cmake fixes

Orochimarufan -

r213:89db53e7cd3e

parent child

Context file:

r213:89db53e7cd3e

Collapse all files

CMakeLists.txt +4 0

             project(PythonQt)
             cmake_minimum_required(VERSION 2.8.10)
+            IF(POLICY CMP0020)
+                cmake_policy(SET CMP0020 NEW)
+            ENDIF()
             include(CTestUseLaunchers OPTIONAL)
             set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
             #-----------------------------------------------------------------------------
             # Debug
             SET(PythonQt_VERSION 2.2.0)
             #-----------------------------------------------------------------------------
             # Debug
             option(PythonQt_DEBUG "Enable/Disable PythonQt debug output" OFF)
             if(PythonQt_DEBUG)
             	add_definitions(-DPYTHONQT_DEBUG)
             else()
             	remove_definitions(-DPYTHONQT_DEBUG)
             endif()
             if(NOT CMAKE_BUILD_TYPE)
             	set(CMAKE_BUILD_TYPE Release)
             endif()
             #-----------------------------------------------------------------------------
             # Qt
             option(PythonQt_Qt5 "Use Qt 5.x" OFF)
             if(PythonQt_Qt5)
             	include(PythonQt_Qt_5x)
             else(PythonQt_Qt5)
             	include(PythonQt_Qt_4x)
             endif(PythonQt_Qt5)
             #-----------------------------------------------------------------------------
             # The variable "generated_cpp_suffix" allows to conditionnally compile the generated wrappers
             # associated with the Qt version being used.
             set(generated_cpp_suffix "_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
             if("${generated_cpp_suffix}" STREQUAL "_48")
             	set(generated_cpp_suffix "")
             endif()
             if("${generated_cpp_suffix}" STREQUAL "_46")
             	set(generated_cpp_suffix "_47") # Also use 4.7 wrappers for 4.6.x version
             endif()
             if("${generated_cpp_suffix}" STREQUAL "_51")
             	set(generated_cpp_suffix "_50")
             endif()
             #-----------------------------------------------------------------------------
             # Generator
             if(PythonQt_Qt5)
             	add_subdirectory(generator_50 EXCLUDE_FROM_ALL)
             	add_custom_target(generator)
             	add_dependencies(generator pythonqt_generator)
             endif()
             # TODO
             #-----------------------------------------------------------------------------
             # Build options
             #option(PythonQt_Wrap_QtAll "Make all Qt components available in python" OFF)
             #
             #set(qtlibs core gui network opengl sql svg uitools webkit xml xmlpatterns)
             #foreach(qtlib ${qtlibs})
             #	OPTION(PythonQt_Wrap_Qt${qtlib} "Make all of Qt${qtlib} available in python" OFF)
             #endforeach()
             # Force option if it applies
             #if(PythonQt_Wrap_QtAll)
             #	list(REMOVE_ITEM qtlibs xmlpatterns) # xmlpatterns wrapper does *NOT* build at all :(
             #	foreach(qtlib ${qtlibs})
             #		if(NOT ${PythonQt_Wrap_Qt${qtlib}})
             #			set(PythonQt_Wrap_Qt${qtlib} ON CACHE BOOL "Make all of Qt${qtlib} available in python" FORCE)
             #			message(STATUS "Enabling [PythonQt_Wrap_Qt${qtlib}] because of [PythonQt_Wrap_QtAll] evaluates to True")
             #		endif()
             #	endforeach()
             #endif()
             #-----------------------------------------------------------------------------
             # Add extra sources
             #foreach(qtlib core gui network opengl sql svg uitools webkit xml xmlpatterns)
             #
             #	if (${PythonQt_Wrap_Qt${qtlib}})
             #
             #		ADD_DEFINITIONS(-DPYTHONQT_WRAP_Qt${qtlib})
             #
             #		set(file_prefix generated_cpp${generated_cpp_suffix}/com_trolltech_qt_${qtlib}/com_trolltech_qt_${qtlib})
             #
             #		foreach(index RANGE 0 11)
             #
             #			# Source files
             #			if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file_prefix}${index}.cpp)
             #				list(APPEND sources ${file_prefix}${index}.cpp)
             #			endif()
             #
             #			# Headers that should run through moc
             #			if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file_prefix}${index}.h)
             #				list(APPEND moc_sources ${file_prefix}${index}.h)
             #			endif()
             #
             #		endforeach()
             #
             #		list(APPEND sources ${file_prefix}_init.cpp)
             #
             #	endif()
             #endforeach()
             #-----------------------------------------------------------------------------
             # Find Python
             option(PythonQt_Python3 "Use Python 3.x (3.3+)" OFF)
             option(PythonQt_Python "Use specific Python Version" OFF)
             if(PythonQt_Python)
             	find_package(Python ${PythonQt_Python} REQUIRED EXACT)
             elseif(PythonQt_Python3)
             	find_package(Python 3.3 REQUIRED)
             else()
             	find_package(Python 2.6 REQUIRED)
             endif()
             if(NOT ${PYTHON_VERSION} VERSION_LESS 3)
             	set(PythonQt_Python3 ON)
             else()
             	set(PythonQt_Python3 OFF)
             endif()
             include_directories(${PYTHON_INCLUDE_DIRS})
             add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
             #-----------------------------------------------------------------------------
             # Library Name
             # The variable PythonQt contains the PythonQt core library name
             #   It incorporates library mayor versions
             set(PythonQt PythonQt)
             if(PythonQt_Qt5)
             	set(PythonQt ${PythonQt}5)
             endif()
             if(PythonQt_Python3)
             	set(PythonQt ${PythonQt}_3)
             endif()
             set(CMAKE_DEBUG_POSTFIX "_d")
             message(STATUS "Building ${PythonQt} (Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} + Python ${PYTHON_VERSION} | ${CMAKE_BUILD_TYPE})")
             #-----------------------------------------------------------------------------
             # Core
             add_subdirectory(src)
             #-----------------------------------------------------------------------------
             # Tests
             add_subdirectory(tests EXCLUDE_FROM_ALL)
             # test alias
             add_custom_target(test COMMAND tests/PythonQtTest WORKING_DIRECTORY ${CURRENT_BINARY_DIR})
             add_dependencies(test PythonQtTest)
             #-----------------------------------------------------------------------------
             # Extenseions (QtAll)
             add_subdirectory(extensions)
             # QtAll alias
             add_custom_target(QtAll)
             add_dependencies(QtAll ${PythonQt_QtAll})
             #-----------------------------------------------------------------------------
             # Examples
             include_directories(src)
             include_directories(extensions/PythonQt_QtAll)
             add_subdirectory(examples EXCLUDE_FROM_ALL)
             #-----------------------------------------------------------------------------
             # uninstall target
             configure_file(
             	"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
             	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
             	IMMEDIATE @ONLY)
             add_custom_target(uninstall
             	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

cmake/FindPython.cmake +12 -6

             # - Find python
             # This module searches for both the python interpreter and the python libraries
             # and determines where they are located
             #
             #
             #  PYTHON_FOUND - The requested Python components were found
             #  PYTHON_EXECUTABLE  - path to the Python interpreter
             #  PYTHON_INCLUDE_DIRS - path to the Python header files
             #  PYTHON_LIBRARIES - the libraries to link against for python
             #  PYTHON_VERSION - the python version
             #
             #=============================================================================
             # Copyright 2010 Branan Purvine-Riley
             #           2013 Orochimarufan
             #
             # Redistribution and use in source and binary forms, with or without
             # modification, are permitted provided that the following conditions
             # are met:
             #
             # * Redistributions of source code must retain the above copyright
             #   notice, this list of conditions and the following disclaimer.
             #
             # * Redistributions in binary form must reproduce the above copyright
             #   notice, this list of conditions and the following disclaimer in the
             #   documentation and/or other materials provided with the distribution.
             #
             # * Neither the names of Kitware, Inc., the Insight Software Consortium,
             #   nor the names of their contributors may be used to endorse or promote
             #   products derived from this software without specific prior written
             #   permission.
             #
             # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
             # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
             # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
             # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
             # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
             # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
             # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
             # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
             # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
             # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
             # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             #=============================================================================
             IF("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
               SET(PYTHON_3_OK "TRUE")
               SET(PYTHON_2_OK "FALSE") # redundant in version selection code, but skips a FOREACH
             ELSE("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
               SET(PYTHON_2_OK "TRUE")
               # don't set PYTHON_3_OK to false here - if the user specified it we want to search for Python 2 & 3
             ENDIF("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
             # This is  heavily inspired by FindBoost.cmake, with the addition of a second version list to keep
             # python 2 and python 3 separate
             IF(Python_FIND_VERSION_EXACT)
               SET(_PYTHON_TEST_VERSIONS "${Python_FIND_VERSION_MAJOR}.${Python_FIND_VERSION_MINOR}")
             ELSE(Python_FIND_VERSION_EXACT)
               # Version lists
               SET(_PYTHON_3_KNOWN_VERSIONS ${PYTHON_3_ADDITIONAL_VERSIONS}
                 "3.3" "3.2" "3.1" "3.0")
               SET(_PYTHON_2_KNOWN_VERSIONS ${PYTHON_2_ADDITIONAL_VERSIONS}
                 "2.7" "2.6" "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5")
               SET(_PYTHON_2_TEST_VERSIONS)
               SET(_PYTHON_3_TEST_VERSIONS)
               SET(_PYTHON_TEST_VERSIONS)
               IF(Python_FIND_VERSION)
                 # python 3 versions
                 IF(PYTHON_3_OK)
                   FOREACH(version ${_PYTHON_3_KNOWN_VERSIONS})
                     IF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
                     LIST(APPEND _PYTHON_3_TEST_VERSIONS ${version})
                     ENDIF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
                   ENDFOREACH(version)
                 ENDIF(PYTHON_3_OK)
                 # python 2 versions
                 IF(PYTHON_2_OK)
                   FOREACH(version ${_PYTHON_2_KNOWN_VERSIONS})
                     IF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
                       LIST(APPEND _PYTHON_2_TEST_VERSIONS ${version})
                     ENDIF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
                   ENDFOREACH(version)
                 ENDIF(PYTHON_2_OK)
               # all versions
               ELSE(Python_FIND_VERSION)
                 IF(PYTHON_3_OK)
                   LIST(APPEND _PYTHON_3_TEST_VERSIONS ${_PYTHON_3_KNOWN_VERSIONS})
                 ENDIF(PYTHON_3_OK)
                 IF(PYTHON_2_OK)
                   LIST(APPEND _PYTHON_2_TEST_VERSIONS ${_PYTHON_2_KNOWN_VERSIONS})
                 ENDIF(PYTHON_2_OK)
               ENDIF(Python_FIND_VERSION)
               # fix python3 version flags
               IF(PYTHON_3_OK)
                 FOREACH(version ${_PYTHON_3_TEST_VERSIONS})
                   IF(${version} VERSION_GREATER 3.1)
                       LIST(APPEND _PYTHON_TEST_VERSIONS "${version}mu" "${version}m" "${version}u" "${version}")
                   ELSE(${version} VERSION_GREATER 3.1)
                     LIST(APPEND _PYTHON_TEST_VERSIONS ${version})
                   ENDIF(${version} VERSION_GREATER 3.1)
                 ENDFOREACH(version)
               ENDIF(PYTHON_3_OK)
               IF(PYTHON_2_OK)
                 LIST(APPEND _PYTHON_TEST_VERSIONS ${_PYTHON_2_TEST_VERSIONS})
               ENDIF(PYTHON_2_OK)
             ENDIF(Python_FIND_VERSION_EXACT)
             SET(_PYTHON_EXE_VERSIONS)
             FOREACH(version ${_PYTHON_TEST_VERSIONS})
               LIST(APPEND _PYTHON_EXE_VERSIONS python${version})
             ENDFOREACH(version ${_PYTHON_TEST_VERSIONS})
             IF(WIN32)
               SET(_PYTHON_REGISTRY_KEYS)
               FOREACH(version ${_PYTHON_TEST_VERSIONS})
                 LIST(APPEND _PYTHON_REGISTRY_KEYS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${version}\\InstallPath])
               ENDFOREACH(version ${_PYTHON_TEST_VERSIONS})
               # this will find any standard windows Python install before it finds anything from Cygwin
               FIND_PROGRAM(PYTHON_EXECUTABLE NAMES python ${_PYTHON_EXE_VERSIONS} PATHS ${_PYTHON_REGISTRY_KEYS})
             ELSE(WIN32)
               FIND_PROGRAM(PYTHON_EXECUTABLE NAMES ${_PYTHON_EXE_VERSIONS} PATHS)
             ENDIF(WIN32)
             EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}" "-c" "from sys import *; stdout.write('%i.%i.%i' % version_info[:3])" OUTPUT_VARIABLE PYTHON_VERSION)
             # Get our library path and include directory from python
             IF(${PYTHON_VERSION} VERSION_GREATER 3.1)
               SET(_PYTHON_SYSCONFIG "sysconfig")
               SET(_PYTHON_SC_INCLUDE "sysconfig.get_path('include')")
             ELSE()
               SET(_PYTHON_SYSCONFIG "distutils.sysconfig")
               SET(_PYTHON_SC_INCLUDE "distutils.sysconfig.get_python_inc()")
             ENDIF()
-            EXECUTE_PROCESS(
-              COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LIBDIR'))"
-              OUTPUT_VARIABLE _PYTHON_LIBRARY_PATH
             IF(WIN32)
               EXECUTE_PROCESS(
-                COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LIBRARY'))"
+                COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('prefix'))"
-                OUTPUT_VARIABLE _PYTHON_LIBRARY_NAME
+                OUTPUT_VARIABLE _PYTHON_PREFIX
+              )
+              EXECUTE_PROCESS(
+                COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('py_version_nodot'))"
+                OUTPUT_VARIABLE _PYTHON_VERSION_MAJOR
               )
+              SET(_PYTHON_LIBRARY_PATH ${_PYTHON_PREFIX}/libs)
+              SET(_PYTHON_LIBRARY_NAME libpython${_PYTHON_VERSION_MAJOR}.a)
             ELSE(WIN32)
               EXECUTE_PROCESS(
+                COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LIBDIR'))"
+                OUTPUT_VARIABLE _PYTHON_LIBRARY_PATH
+              )
+              EXECUTE_PROCESS(
                 COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LDLIBRARY'))"
                 OUTPUT_VARIABLE _PYTHON_LIBRARY_NAME
               )
               # Multiarch
               EXECUTE_PROCESS(
                 COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_vars().get('MULTIARCH', 'PYTHON_LIBRARY_MULTIARCH-NOTFOUND'))"
                 OUTPUT_VARIABLE _PYTHON_LIBRARY_MULTIARCH
               )
               IF(NOT "${_PYTHON_LIBRARY_MULTIARCH}" STREQUAL "PYTHON_LIBRARY_MULTIARCH-NOTFOUND")
                 SET(_PYTHON_LIBRARY_PATH_X ${_PYTHON_LIBRARY_PATH})
                 SET(_PYTHON_LIBRARY_PATH)
                 FOREACH(path ${_PYTHON_LIBRARY_PATH_X})
                   LIST(APPEND _PYTHON_LIBRARY_PATH "${path}/${_PYTHON_LIBRARY_MULTIARCH}" "${path}")
                 ENDFOREACH(path)
               ENDIF(NOT "${_PYTHON_LIBRARY_MULTIARCH}" STREQUAL "PYTHON_LIBRARY_MULTIARCH-NOTFOUND")
             ENDIF(WIN32)
             EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}"
               "-c" "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SC_INCLUDE})"
               OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
             )
             FIND_FILE(PYTHON_LIBRARY ${_PYTHON_LIBRARY_NAME} PATHS ${_PYTHON_LIBRARY_PATH} NO_DEFAULT_PATH)
             FIND_FILE(PYTHON_HEADER "Python.h" PATHS ${PYTHON_INCLUDE_DIR} NO_DEFAULT_PATH)
             set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
             set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
             INCLUDE(FindPackageHandleStandardArgs)
             FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python
               REQUIRED_VARS PYTHON_EXECUTABLE PYTHON_HEADER PYTHON_LIBRARY
               VERSION_VAR PYTHON_VERSION
             )
             MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
             MARK_AS_ADVANCED(PYTHON_INCLUDE_DIRS)
             MARK_AS_ADVANCED(PYTHON_LIBRARIES)
             MARK_AS_ADVANCED(PYTHON_VERSION)

extensions/PythonQt_QtAll/CMakeLists.txt +1 -1

             project(PythonQt_QtAll)
             # Bindings
             SET(HEADERS
             	PythonQt_QtAll.h
             )
             SET(SOURCES
             	PythonQt_QtAll.cpp
             )
             #-------------------------------------------------------------------
             # Generated stuff
             SET(GEN ../../generated_cpp${generated_cpp_suffix})
             SET(GEN_HEADERS)
             SET(GEN_SOURCES)
             foreach(MODULE core gui network opengl sql svg uitools webkit xml)
             	SET(MODULE_TROLL com_trolltech_qt_${MODULE})
             	SET(MODULE_BASE ${GEN}/${MODULE_TROLL}/${MODULE_TROLL})
             	FILE(GLOB HFILES ${MODULE_BASE}*.h)
             	FILE(GLOB CFILES ${MODULE_BASE}*.cpp)
             	LIST(APPEND GEN_HEADERS ${HFILES})
             	LIST(APPEND GEN_SOURCES ${CFILES})
             endforeach()
             ## Core
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core0.h
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core1.h
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core2.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core0.cpp
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core1.cpp
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core2.cpp
             #	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core_init.cpp
             #)
             ## Gui
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui0.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui1.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui2.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui3.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui4.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui5.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui6.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui7.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui8.h
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui9.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui0.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui1.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui2.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui3.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui4.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui5.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui6.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui7.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui8.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui9.cpp
             #	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui_init.cpp
             #)
             ## Network
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network0.cpp
             #	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network_init.cpp
             #)
             ## OpenGL
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl0.cpp
             #	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl_init.cpp
             #)
             ## Sql
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql0.cpp
             #	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql_init.cpp
             #)
             ## Svg
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg0.cpp
             #	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg_init.cpp
             #)
             ## uitools
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools0.cpp
             #	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools_init.cpp
             #)
             ## WebKit
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit0.cpp
             #	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit_init.cpp
             #)
             ## Xml
             #LIST(APPEND HEADERS
             #	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml0.h
             #)
             #LIST(APPEND SOURCES
             #	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml0.cpp
             #	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml_init.cpp
             #)
             #-------------------------------------------------------------------
             # Build
             set(PythonQt_QtAll ${PythonQt}_QtAll CACHE INTERNAL "")
             include_directories(../../src)
             add_definitions(-DPYTHONQT_QTALL_EXPORTS)
             qt_wrap_cpp(GEN_MOC ${GEN_HEADERS})
             SET(QT Core Gui Network OpenGL Sql Svg UiTools WebKit Xml)
             if(PythonQt_Qt5)
             	LIST(APPEND QT Widgets WebKitWidgets)
             endif()
             add_library(${PythonQt_QtAll} SHARED ${SOURCES} ${HEADERS} ${GEN_SOURCES} ${GEN_MOC})
             qt_use_modules(${PythonQt_QtAll} ${QT})
             target_link_libraries(${PythonQt_QtAll} ${PythonQt} ${PYTHON_LIBRARIES})
             set_target_properties(${PythonQt_QtAll} PROPERTIES PUBLIC_HEADER "${HEADERS}")
             install(TARGETS ${PythonQt_QtAll} EXPORT ${PythonQt_QtAll}Targets COMPONENT QtAll
             				RUNTIME DESTINATION bin
             				LIBRARY DESTINATION lib
             				ARCHIVE DESTINATION lib
             				PUBLIC_HEADER DESTINATION include/PythonQt)
             #-----------------------------------------------------------------------------
             # Export CMake Config
             if(WIN32 AND NOT CYGWIN)
             	set(LIB_CMAKE_PATH "cmake")
             else()
             	set(LIB_CMAKE_PATH "lib/cmake/${PythonQt_QtAll}")
             endif()
             export(TARGETS ${PythonQt_QtAll} ${PythonQt} FILE "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}Targets.cmake")
             export(PACKAGE ${PythonQt_QtAll})
             # build tree
             set(INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
             configure_file(PythonQt_QtAllConfig.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}Config.cmake" @ONLY)
             # install tree
-            set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+            set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/PythonQt")
             configure_file(PythonQt_QtAllConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt_QtAll}Config.cmake" @ONLY)
             # both
             configure_file(PythonQt_QtAllConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}ConfigVersion.cmake" @ONLY)
             install(EXPORT ${PythonQt_QtAll}Targets DESTINATION "${LIB_CMAKE_PATH}" COMPONENT QtAll-dev)
             install(FILES ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt_QtAll}Config.cmake
             			  ${PROJECT_BINARY_DIR}/${PythonQt_QtAll}ConfigVersion.cmake
             		DESTINATION "${LIB_CMAKE_PATH}" COMPONENT QtAll-dev)

extensions/PythonQt_QtAll/PythonQt_QtAllConfig.cmake.in +3 -4

             # - Config file for the PythonQt package
             # It defines the following variables
-            #  PythonQt                    - the PythonQt core target (PythonQt PythonQt_3 PythonQt5 PythonQt5_3)
             #  PythonQt_QtAll              - the PythonQt QtAll target
             #  PythonQt_QtAll_INCLUDE_DIRS - include directories for PythonQt
             #  PythonQt_QtAll_LIBRARIES    - libraries to link against
             #  PythonQt_QtAll_QT           - linked Qt modules
             set(PythonQt_QtAll @PythonQt_QtAll@)
             set(PythonQt_QtAll_QT @QT@)
-            find_package(@PythonQt@)
             # Compute paths
             get_filename_component(PYTHONQT_QTALL_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
             set(PythonQt_QtAll_INCLUDE_DIRS "@INCLUDE_DIRS@")
             # Our library dependencies (contains definitions for IMPORTED targets)
             if(NOT TARGET @PythonQt_QtAll@)
               include("${PYTHONQT_QTALL_CMAKE_DIR}/@PythonQt_QtAll@Targets.cmake")
             endif()
+            find_package(@PythonQt@)
             # These are IMPORTED targets created by @PythonQt_QtAll@Targets.cmake
-            set(PythonQt_QtAll_LIBRARIES @PythonQt_QtAll@ @PythonQt@)
+            set(PythonQt_QtAll_LIBRARIES @PythonQt_QtAll@)

src/CMakeLists.txt +2 -2

             project(PythonQt_Core)
-            cmake_minimum_required(VERSION 2.8.10)
             #-----------------------------------------------------------------------------
             # Sources
             set(SOURCES
             	PythonQtClassInfo.cpp
             	PythonQtClassWrapper.cpp
             	PythonQtConversion.cpp
             	PythonQt.cpp
             	PythonQtImporter.cpp
             	PythonQtInstanceWrapper.cpp
             	PythonQtMethodInfo.cpp
             	PythonQtMisc.cpp
             	PythonQtObjectPtr.cpp
             	PythonQtQFileImporter.cpp
             	PythonQtSignalReceiver.cpp
             	PythonQtSlot.cpp
             	PythonQtSignal.cpp
             	PythonQtStdDecorators.cpp
             	PythonQtStdIn.cpp
             	PythonQtStdOut.cpp
             	gui/PythonQtScriptingConsole.cpp
             	../generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.cpp
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.cpp
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin_init.cpp
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.cpp
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin_init.cpp
             )
             #-----------------------------------------------------------------------------
             # List headers.	This is list is used for the install command.
             set(HEADERS
             	PythonQtClassInfo.h
             	PythonQtClassWrapper.h
             	PythonQtConversion.h
             	PythonQtCppWrapperFactory.h
             	PythonQtDoc.h
             	PythonQt.h
             	PythonQtImporter.h
             	PythonQtImportFileInterface.h
             	PythonQtInstanceWrapper.h
             	PythonQtMethodInfo.h
             	PythonQtMisc.h
             	PythonQtObjectPtr.h
             	PythonQtQFileImporter.h
             	PythonQtSignalReceiver.h
             	PythonQtSlot.h
             	PythonQtSignal.h
             	PythonQtStdDecorators.h
             	PythonQtStdIn.h
             	PythonQtStdOut.h
             	PythonQtSystem.h
             	PythonQtVariants.h
             	PythonQtPythonInclude.h
             	../generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h
             )
             #-----------------------------------------------------------------------------
             # Headers that should run through moc
             set(SOURCES_MOC
             	PythonQt.h
             	PythonQtSignalReceiver.h
             	PythonQtStdDecorators.h
             	gui/PythonQtScriptingConsole.h
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h
             	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.h
             )
             #-----------------------------------------------------------------------------
             # Resources
             set(SOURCES_QRC )
             #-----------------------------------------------------------------------------
             # Build the library
             include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+            add_definitions(-DPYTHONQT_EXPORTS)
             qt_wrap_cpp(GEN_MOC ${SOURCES_MOC})
             qt_add_resources(GEN_QRC ${SOURCES_QRC})
             add_library(${PythonQt} SHARED ${SOURCES} ${GEN_MOC} ${GEN_QRC} ${HEADERS})
             if(PythonQt_Qt5)
             	qt_use_modules(${PythonQt} Core Gui Widgets)
             else()
             	qt_use_modules(${PythonQt} Core Gui)
             endif()
             target_link_libraries(${PythonQt} ${PYTHON_LIBRARIES})
             #
             # That should solve linkage error on Mac when the project is used in a superbuild setup
             # See http://blog.onesadcookie.com/2008/01/installname-magic.html
             #
             set_target_properties(${PythonQt} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
             #-----------------------------------------------------------------------------
             # Install library (on windows, put the dll in 'bin' and the archive in 'lib')
             set_target_properties(${PythonQt} PROPERTIES PUBLIC_HEADER "${HEADERS}")
             install(TARGETS ${PythonQt} EXPORT ${PythonQt}Targets COMPONENT core-dev
             				RUNTIME DESTINATION bin COMPONENT core
             				LIBRARY DESTINATION lib COMPONENT core
             				ARCHIVE DESTINATION lib COMPONENT core
             				PUBLIC_HEADER DESTINATION include/PythonQt)
             #-----------------------------------------------------------------------------
             # Export CMake Config
             if(WIN32 AND NOT CYGWIN)
             	set(LIB_CMAKE_PATH "cmake")
             else()
             	set(LIB_CMAKE_PATH "lib/cmake/${PythonQt}")
             endif()
             export(TARGETS ${PythonQt} FILE "${PROJECT_BINARY_DIR}/${PythonQt}Targets.cmake")
             export(PACKAGE ${PythonQt})
             # build tree
             set(INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
             configure_file(PythonQtConfig.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt}Config.cmake" @ONLY)
             # install tree
-            set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+            set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/PythonQt")
             configure_file(PythonQtConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt}Config.cmake" @ONLY)
             # both
             configure_file(PythonQtConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt}ConfigVersion.cmake" @ONLY)
             install(EXPORT ${PythonQt}Targets DESTINATION "${LIB_CMAKE_PATH}" COMPONENT core-dev)
             install(FILES ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt}Config.cmake
             			  ${PROJECT_BINARY_DIR}/${PythonQt}ConfigVersion.cmake
             		DESTINATION "${LIB_CMAKE_PATH}" COMPONENT core-dev)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages