From 3534d8d0a7dc65f6fb8110abbaf570b70d729584 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Wed, 14 Sep 2011 15:30:16 -0300 Subject: Updated CMake to find for python3. --- CMakeLists.txt | 19 ++- cmake/Modules/FindPython3Interp.cmake | 37 +++++ cmake/Modules/FindPython3InterpWithDebug.cmake | 48 ++++++ cmake/Modules/FindPython3Libs.cmake | 210 +++++++++++++++++++++++++ cmake/Modules/FindPythonInterpWithDebug.cmake | 7 +- data/CMakeLists.txt | 4 +- data/ShibokenConfig-spec.cmake.in | 8 +- data/ShibokenConfig.cmake.in | 8 +- data/shiboken.pc.in | 2 +- libshiboken/CMakeLists.txt | 2 +- 10 files changed, 328 insertions(+), 17 deletions(-) create mode 100644 cmake/Modules/FindPython3Interp.cmake create mode 100644 cmake/Modules/FindPython3InterpWithDebug.cmake create mode 100644 cmake/Modules/FindPython3Libs.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9868ad3f1..c3410e2f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/ find_package(Qt4 4.5.0) find_package(ApiExtractor 0.10.7 REQUIRED) find_package(GeneratorRunner 0.6.13 REQUIRED) -find_package(PythonLibs) -find_package(PythonInterpWithDebug) add_definitions(${QT_DEFINITIONS}) @@ -20,6 +18,23 @@ set(shiboken_MICRO_VERSION "7") set(shiboken_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}") option(BUILD_TESTS "Build tests." TRUE) +option(USE_PYTHON3 "Use python3 libraries to build shiboken." FALSE) + +if (USE_PYTHON3) + find_package(Python3Libs) + find_package(Python3InterpWithDebug) + #use commom vars + set(PYTHONLIBS_FOUND ${PYTHON3LIBS_FOUND}) + set(PYTHON_LIBRARIES ${PYTHON3_LIBRARIES}) + set(PYTHON_INCLUDE_DIRS ${PYTHON3_INCLUDE_DIRS}) + set(PYTHON_DEBUG_LIBRARIES ${PYTHON3_DEBUG_LIBRARIES}) + set(PYTHONINTERP_FOUND ${PYTHON3INTERP_FOUND}) + set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE}) +else() + find_package(PythonLibs 2.6) + find_package(PythonInterpWithDebug) +endif() + if(MSVC) set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS") diff --git a/cmake/Modules/FindPython3Interp.cmake b/cmake/Modules/FindPython3Interp.cmake new file mode 100644 index 000000000..a77029160 --- /dev/null +++ b/cmake/Modules/FindPython3Interp.cmake @@ -0,0 +1,37 @@ +# - Find python interpreter +# This module finds if Python interpreter is installed and determines where the +# executables are. This code sets the following variables: +# +# PYTHONINTERP3_FOUND - Was the Python executable found +# PYTHON3_EXECUTABLE - path to the Python interpreter +# + +#============================================================================= +# Copyright 2005-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distributed this file outside of CMake, substitute the full +# License text for the above reference.) + +FIND_PROGRAM(PYTHON3_EXECUTABLE + NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3 + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.0\\InstallPath] + ) + +# handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python3Interp DEFAULT_MSG PYTHON3_EXECUTABLE) + +MARK_AS_ADVANCED(PYTHON3_EXECUTABLE) + + diff --git a/cmake/Modules/FindPython3InterpWithDebug.cmake b/cmake/Modules/FindPython3InterpWithDebug.cmake new file mode 100644 index 000000000..8791718b1 --- /dev/null +++ b/cmake/Modules/FindPython3InterpWithDebug.cmake @@ -0,0 +1,48 @@ +INCLUDE(FindPython3Interp) +INCLUDE(FindPython3Libs) + +find_package(Python3Interp REQUIRED) + +if(PYTHON3INTERP_FOUND AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") + # This is for Debian + set(PYTHON3_EXECUTABLE_TMP "${PYTHON3_EXECUTABLE}-dbg") + + # Fall back to the standard interpreter. + if(NOT EXISTS "${PYTHON3_EXECUTABLE_TMP}") + set(PYTHON3_EXECUTABLE_TMP "${PYTHON3_EXECUTABLE}") + endif() + + set(PYTHON3_EXECUTABLE "${PYTHON3_EXECUTABLE_TMP}") +endif() + +# Detect if the python libs were compiled in debug mode +execute_process( + COMMAND ${PYTHON3_EXECUTABLE} -c "from distutils import sysconfig; \\ + print(bool(sysconfig.get_config_var('Py_DEBUG')))" + OUTPUT_VARIABLE PYTHON_WITH_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE) + +execute_process( + COMMAND ${PYTHON3_EXECUTABLE} -c "import sys; \\ + from distutils import sysconfig; \\ + vr = sys.version_info; \\ + prefix = '-python%d.%d' % (vr[0], vr[1]); \\ + suffix = prefix + '-dbg' if bool(sysconfig.get_config_var('Py_DEBUG')) else prefix; \\ + suffix = '.' + sysconfig.get_config_var('SOABI') if (vr.major == 3 and vr.minor >= 2) else suffix; \\ + print(suffix)" + OUTPUT_VARIABLE PYTHON_SUFFIX + OUTPUT_STRIP_TRAILING_WHITESPACE) + +#Fix missing variable on UNIX env +if(NOT PYTHON3_DEBUG_LIBRARIES AND UNIX) + string(REPLACE "-dbg" "" PYTHON_NAME_AUX ${PYTHON_SUFFIX}) + string(REPLACE "-python" "python" PYTHON_NAME ${PYTHON_NAME_AUX}) + find_library(LIBRARY_FOUND ${PYTHON_NAME}_d) + if (LIBRARY_FOUND) + set(PYTHON3_DEBUG_LIBRARIES "${LIBRARY_FOUND}") + else() + set(PYTHON3_DEBUG_LIBRARIES "${PYTHON3_LIBRARIES}") + endif() +endif() + + diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake new file mode 100644 index 000000000..03fe8b80e --- /dev/null +++ b/cmake/Modules/FindPython3Libs.cmake @@ -0,0 +1,210 @@ +# - Find python libraries +# This module finds if Python is installed and determines where the +# include files and libraries are. It also determines what the name of +# the library is. This code sets the following variables: +# +# PYTHONLIBS3_FOUND - have the Python libs been found +# PYTHON3_LIBRARIES - path to the python library +# PYTHON3_INCLUDE_DIRS - path to where Python.h is found +# PYTHON3_DEBUG_LIBRARIES - path to the debug library +# + +#============================================================================= +# Copyright 2001-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distributed this file outside of CMake, substitute the full +# License text for the above reference.) + +INCLUDE(CMakeFindFrameworks) +# Is there a python3 framework? How do we search for it? +# Search for the python framework on Apple. +# CMAKE_FIND_FRAMEWORKS(Python) + +FOREACH(_CURRENT_VERSION 3.2 3.1 3.0) + IF(_CURRENT_VERSION GREATER 3.1) + SET(_32FLAGS "m" "u" "mu" "") + ELSE() + SET(_32FLAGS "") + ENDIF() + FOREACH(_COMPILATION_FLAGS ${_32FLAGS}) + STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) + IF(WIN32) + IF(_CURRENT_VERSION GREATER 3.1) + FIND_LIBRARY(PYTHON3_DEBUG_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}d${_COMPILATION_FLAGS} python + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs ) + ELSE() + FIND_LIBRARY(PYTHON3_DEBUG_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}${_COMPILATION_FLAGS}_d python + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs ) + ENDIF() + ENDIF(WIN32) + + FIND_LIBRARY(PYTHON3_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}${_COMPILATION_FLAGS} python${_CURRENT_VERSION}${_COMPILATION_FLAGS} + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs + # Avoid finding the .dll in the PATH. We want the .lib. + NO_SYSTEM_ENVIRONMENT_PATH + ) + # Look for the static library in the Python config directory + FIND_LIBRARY(PYTHON3_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}${_COMPILATION_FLAGS} python${_CURRENT_VERSION}${_COMPILATION_FLAGS} + # Avoid finding the .dll in the PATH. We want the .lib. + NO_SYSTEM_ENVIRONMENT_PATH + # This is where the static library is usually located + PATH_SUFFIXES python${_CURRENT_VERSION}/config + ) + + IF(_CURRENT_VERSION GREATER 3.1) + FIND_LIBRARY(PYTHON3_DEBUG_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}d${_COMPILATION_FLAGS} python${_CURRENT_VERSION}d${_COMPILATION_FLAGS} + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs + # Avoid finding the .dll in the PATH. We want the .lib. + NO_SYSTEM_ENVIRONMENT_PATH + ) + # Look for the static library in the Python config directory + FIND_LIBRARY(PYTHON3_DEBUG_LIBRARY + NAMES python${_CURRENT_VERSION_NO_DOTS}d${_COMPILATION_FLAGS} python${_CURRENT_VERSION}d${_COMPILATION_FLAGS} + # Avoid finding the .dll in the PATH. We want the .lib. + NO_SYSTEM_ENVIRONMENT_PATH + # This is where the static library is usually located + PATH_SUFFIXES python${_CURRENT_VERSION}/config + ) + ENDIF() + +# SET(PYTHON_FRAMEWORK_INCLUDES) +# IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR) +# FOREACH(dir ${Python_FRAMEWORKS}) +# SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} +# ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION}) +# ENDFOREACH(dir) +# ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR) + + FIND_PATH(PYTHON3_INCLUDE_DIR + NAMES Python.h + PATHS + ${PYTHON_FRAMEWORK_INCLUDES} + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include + PATH_SUFFIXES + python${_CURRENT_VERSION}${_COMPILATION_FLAGS} + ) + + # For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal. + SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL + "Path to where Python.h is found (deprecated)") + ENDFOREACH(_COMPILATION_FLAGS) +ENDFOREACH(_CURRENT_VERSION) + +MARK_AS_ADVANCED( + PYTHON3_DEBUG_LIBRARY + PYTHON3_LIBRARY + PYTHON3_INCLUDE_DIR +) + +# We use PYTHON3_INCLUDE_DIR, PYTHON3_LIBRARY and PYTHON3_DEBUG_LIBRARY for the +# cache entries because they are meant to specify the location of a single +# library. We now set the variables listed by the documentation for this +# module. +SET(PYTHON3_INCLUDE_DIRS "${PYTHON3_INCLUDE_DIR}") +SET(PYTHON3_LIBRARIES "${PYTHON3_LIBRARY}") +SET(PYTHON3_DEBUG_LIBRARIES "${PYTHON3_DEBUG_LIBRARY}") + + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python3Libs DEFAULT_MSG PYTHON3_LIBRARIES PYTHON3_INCLUDE_DIRS) + + +# PYTHON_ADD_MODULE( src1 src2 ... srcN) is used to build modules for python. +# PYTHON_WRITE_MODULES_HEADER() writes a header file you can include +# in your sources to initialize the static python modules + +GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS + GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) + +FUNCTION(PYTHON3_ADD_MODULE _NAME ) + OPTION(PYTHON3_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE) + OPTION(PYTHON3_MODULE_${_NAME}_BUILD_SHARED + "Add module ${_NAME} shared" ${_TARGET_SUPPORTS_SHARED_LIBS}) + + # Mark these options as advanced + MARK_AS_ADVANCED(PYTHON3_ENABLE_MODULE_${_NAME} + PYTHON3_MODULE_${_NAME}_BUILD_SHARED) + + IF(PYTHON3_ENABLE_MODULE_${_NAME}) + IF(PYTHON3_MODULE_${_NAME}_BUILD_SHARED) + SET(PY_MODULE_TYPE MODULE) + ELSE(PYTHON3_MODULE_${_NAME}_BUILD_SHARED) + SET(PY_MODULE_TYPE STATIC) + SET_PROPERTY(GLOBAL APPEND PROPERTY PY_STATIC_MODULES_LIST ${_NAME}) + ENDIF(PYTHON3_MODULE_${_NAME}_BUILD_SHARED) + + SET_PROPERTY(GLOBAL APPEND PROPERTY PY_MODULES_LIST ${_NAME}) + ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN}) +# TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES}) + + ENDIF(PYTHON3_ENABLE_MODULE_${_NAME}) +ENDFUNCTION(PYTHON3_ADD_MODULE) + +FUNCTION(PYTHON3_WRITE_MODULES_HEADER _filename) + + GET_PROPERTY(PY_STATIC_MODULES_LIST GLOBAL PROPERTY PY_STATIC_MODULES_LIST) + + GET_FILENAME_COMPONENT(_name "${_filename}" NAME) + STRING(REPLACE "." "_" _name "${_name}") + STRING(TOUPPER ${_name} _nameUpper) + + SET(_filenameTmp "${_filename}.in") + FILE(WRITE ${_filenameTmp} "/*Created by cmake, do not edit, changes will be lost*/\n") + FILE(APPEND ${_filenameTmp} +"#ifndef ${_nameUpper} +#define ${_nameUpper} + +#include + +#ifdef __cplusplus +extern \"C\" { +#endif /* __cplusplus */ + +") + + FOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + FILE(APPEND ${_filenameTmp} "extern void init${PYTHON_MODULE_PREFIX}${_currentModule}(void);\n\n") + ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + + FILE(APPEND ${_filenameTmp} +"#ifdef __cplusplus +} +#endif /* __cplusplus */ + +") + + + FOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + FILE(APPEND ${_filenameTmp} "int ${_name}_${_currentModule}(void) \n{\n static char name[]=\"${PYTHON_MODULE_PREFIX}${_currentModule}\"; return PyImport_AppendInittab(name, init${PYTHON_MODULE_PREFIX}${_currentModule});\n}\n\n") + ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + + FILE(APPEND ${_filenameTmp} "void ${_name}_LoadAllPythonModules(void)\n{\n") + FOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + FILE(APPEND ${_filenameTmp} " ${_name}_${_currentModule}();\n") + ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST}) + FILE(APPEND ${_filenameTmp} "}\n\n") + FILE(APPEND ${_filenameTmp} "#ifndef EXCLUDE_LOAD_ALL_FUNCTION\nvoid CMakeLoadAllPythonModules(void)\n{\n ${_name}_LoadAllPythonModules();\n}\n#endif\n\n#endif\n") + +# with CONFIGURE_FILE() cmake complains that you may not use a file created using FILE(WRITE) as input file for CONFIGURE_FILE() + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_filenameTmp}" "${_filename}" OUTPUT_QUIET ERROR_QUIET) + +ENDFUNCTION(PYTHON3_WRITE_MODULES_HEADER) + diff --git a/cmake/Modules/FindPythonInterpWithDebug.cmake b/cmake/Modules/FindPythonInterpWithDebug.cmake index 76c93fcfe..58a1c3d1a 100644 --- a/cmake/Modules/FindPythonInterpWithDebug.cmake +++ b/cmake/Modules/FindPythonInterpWithDebug.cmake @@ -27,13 +27,14 @@ execute_process( from distutils import sysconfig; \\ vr = sys.version_info; \\ suffix = '-dbg' if bool(sysconfig.get_config_var('Py_DEBUG')) else ''; \\ - print 'python%d.%d%s' % (vr[0], vr[1], suffix)" - OUTPUT_VARIABLE PYTHON_BASENAME + print '-python%d.%d%s' % (vr[0], vr[1], suffix)" + OUTPUT_VARIABLE PYTHON_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) #Fix missing variable on UNIX env if(NOT PYTHON_DEBUG_LIBRARIES AND UNIX) - string(REPLACE "-dbg" "" PYTHON_NAME ${PYTHON_BASENAME}) + string(REPLACE "-dbg" "" PYTHON_NAME_TMP ${PYTHON_SUFFIX}) + string(REPLACE "-python" "python" PYTHON_NAME ${PYTHON_NAME_TMP}) find_library(LIBRARY_FOUND ${PYTHON_NAME}_d) if (LIBRARY_FOUND) set(PYTHON_DEBUG_LIBRARIES "${LIBRARY_FOUND}") diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index da9dbd4cc..c40d5525f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -11,7 +11,7 @@ get_target_property(SHIBOKEN_GENERATOR shiboken OUTPUT_NAME) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-spec.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig-${PYTHON_BASENAME}.cmake" @ONLY) + "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig${PYTHON_SUFFIX}.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" @@ -19,7 +19,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig-${PYTHON_BASENAME}.cmake" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig${PYTHON_SUFFIX}.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${shiboken_VERSION}") diff --git a/data/ShibokenConfig-spec.cmake.in b/data/ShibokenConfig-spec.cmake.in index 74c5f4e5f..e31d25c8e 100644 --- a/data/ShibokenConfig-spec.cmake.in +++ b/data/ShibokenConfig-spec.cmake.in @@ -7,17 +7,17 @@ SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@") if(MSVC) - SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@-@PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@.lib") + SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib") elseif(WIN32) - SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@-@PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") + SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") else() - SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@-@PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") + SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") endif() SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@") SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@") SET(SHIBOKEN_PYTHON_INTERPRETER "@PYTHON_EXECUTABLE@") SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@") -SET(SHIBOKEN_PYTHON_BASENAME "@PYTHON_BASENAME@") +SET(SHIBOKEN_PYTHON_SUFFIX "@PYTHON_SUFFIX@") message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@") @SBK_ADD_PY_DEBUG_DEFINITION@ diff --git a/data/ShibokenConfig.cmake.in b/data/ShibokenConfig.cmake.in index 92f5d02ca..7d8bc863e 100644 --- a/data/ShibokenConfig.cmake.in +++ b/data/ShibokenConfig.cmake.in @@ -1,5 +1,5 @@ -if (NOT PYTHON_BASENAME) - message(STATUS "Using default python: @PYTHON_BASENAME@") - SET(PYTHON_BASENAME @PYTHON_BASENAME@) +if (NOT PYTHON_SUFFIX) + message(STATUS "Using default python: @PYTHON_SUFFIX@") + SET(PYTHON_SUFFIX @PYTHON_SUFFIX@) endif() -include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig-${PYTHON_BASENAME}.cmake) +include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake) diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in index 5de317089..a603a6b2e 100644 --- a/data/shiboken.pc.in +++ b/data/shiboken.pc.in @@ -9,5 +9,5 @@ python_include_dir=@SBK_PYTHON_INCLUDE_DIR@ Name: shiboken Description: Support library for Python bindings created with Shiboken generator. Version: @shiboken_VERSION@ -Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken${shiboken_SUFFIX}-@PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@ +Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken${shiboken_SUFFIX}@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/${shiboken_SUFFIX}@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@ diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt index 487f0e243..f42b6d925 100644 --- a/libshiboken/CMakeLists.txt +++ b/libshiboken/CMakeLists.txt @@ -38,7 +38,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARSEHASH_INCLUDE_PATH}) add_library(libshiboken SHARED ${libshiboken_SRC}) target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES}) -set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken${shiboken_SUFFIX}-${PYTHON_BASENAME}" +set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken${shiboken_SUFFIX}${PYTHON_SUFFIX}" VERSION ${libshiboken_VERSION} SOVERSION ${libshiboken_SOVERSION} DEFINE_SYMBOL LIBSHIBOKEN_EXPORTS) -- cgit v1.2.3