diff options
| author | Thomas-Karl Pietrowski <thopiekar@googlemail.com> | 2016-01-22 09:27:50 +0100 |
|---|---|---|
| committer | Thomas-Karl Pietrowski <thopiekar@googlemail.com> | 2016-01-22 09:27:50 +0100 |
| commit | 422d9b902b92147e144cf65f18c485a18abaea0b (patch) | |
| tree | 22a87a4df19cf74f0d607946faf1234cb18ccdc9 | |
| parent | f45e9bd9b08fe21afa222b6680a0fff31a5d4b6a (diff) | |
Just missed to rename some other PYTHON_SUFFIX to PYTHON_EXTENSION_SUFFIX
| -rw-r--r-- | data/Shiboken2Config-spec.cmake.in | 10 | ||||
| -rw-r--r-- | data/Shiboken2Config.cmake.in | 8 | ||||
| -rw-r--r-- | data/shiboken2.pc.in | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/Shiboken2Config-spec.cmake.in b/data/Shiboken2Config-spec.cmake.in index 0737c44..1aac9ca 100644 --- a/data/Shiboken2Config-spec.cmake.in +++ b/data/Shiboken2Config-spec.cmake.in @@ -7,13 +7,13 @@ SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken2@shiboken2_SUFFIX@") if(MSVC) - SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib") + SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_EXTENSION_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib") elseif(CYGWIN) - SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_IMPORT_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@") + SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_IMPORT_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_EXTENSION_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@") elseif(WIN32) - SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") + SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_EXTENSION_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") else() - SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") + SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken2@shiboken2_SUFFIX@@PYTHON_EXTENSION_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@") @@ -22,7 +22,7 @@ SET(SHIBOKEN_PYTHON_VERSION_MAJOR "@PYTHON_VERSION_MAJOR@") SET(SHIBOKEN_PYTHON_VERSION_MINOR "@PYTHON_VERSION_MINOR@") SET(SHIBOKEN_PYTHON_VERSION_PATCH "@PYTHON_VERSION_PATCH@") SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@") -SET(SHIBOKEN_PYTHON_SUFFIX "@PYTHON_SUFFIX@") +SET(SHIBOKEN_PYTHON_EXTENSION_SUFFIX "@PYTHON_EXTENSION_SUFFIX@") message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@") @SBK_ADD_PY_DEBUG_DEFINITION@ diff --git a/data/Shiboken2Config.cmake.in b/data/Shiboken2Config.cmake.in index c674ff2..5f7ecae 100644 --- a/data/Shiboken2Config.cmake.in +++ b/data/Shiboken2Config.cmake.in @@ -1,5 +1,5 @@ -if (NOT PYTHON_SUFFIX) - message(STATUS "Shiboken2Config: Using default python: @PYTHON_SUFFIX@") - SET(PYTHON_SUFFIX @PYTHON_SUFFIX@) +if (NOT PYTHON_EXTENSION_SUFFIX) + message(STATUS "Shiboken2Config: Using default python: @PYTHON_EXTENSION_SUFFIX@") + SET(PYTHON_EXTENSION_SUFFIX @PYTHON_EXTENSION_SUFFIX@) endif() -include(@LIB_INSTALL_DIR@/cmake/Shiboken2-@shiboken2_VERSION@/Shiboken2Config${PYTHON_SUFFIX}.cmake) +include(@LIB_INSTALL_DIR@/cmake/Shiboken2-@shiboken2_VERSION@/Shiboken2Config${PYTHON_EXTENSION_SUFFIX}.cmake) diff --git a/data/shiboken2.pc.in b/data/shiboken2.pc.in index 7320f89..aec210c 100644 --- a/data/shiboken2.pc.in +++ b/data/shiboken2.pc.in @@ -9,5 +9,5 @@ python_include_dir=@SBK_PYTHON_INCLUDE_DIR@ Name: shiboken2 Description: Support library for Python bindings created with the Shiboken2 generator. Version: @shiboken2_VERSION@ -Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken2@shiboken2_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ +Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken2@shiboken2_SUFFIX@@PYTHON_EXTENSION_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/@shiboken2_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@ |