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})

cmake/FindPython.cmake +11 -5

               SET(_PYTHON_SC_INCLUDE "distutils.sysconfig.get_python_inc()")
             ENDIF()
+            IF(WIN32)
               EXECUTE_PROCESS(
-              COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LIBDIR'))"
+                COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('prefix'))"
-              OUTPUT_VARIABLE _PYTHON_LIBRARY_PATH
+                OUTPUT_VARIABLE _PYTHON_PREFIX
               )
-            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('py_version_nodot'))"
-                OUTPUT_VARIABLE _PYTHON_LIBRARY_NAME
+                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
               )

extensions/PythonQt_QtAll/CMakeLists.txt +1 -1

             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)

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
             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@")
               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
             #-----------------------------------------------------------------------------
             # 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})
             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)

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