diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-12 09:41:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-18 12:20:16 +0200 |
| commit | a6d206f4aa3a583304b88fad80dd341bccb45975 (patch) | |
| tree | a0c0fa078db8605d3b6ba63b58891366ee87055f | |
| parent | cde603ba2c4fe7db1711aaf033f796112a840e7d (diff) | |
shiboken: Fix cross builds
Patch as contributed on JIRA.
Fixes: PYSIDE-1299
Change-Id: Ifbf94e59712cf16c0161da57691008f3895a64e3
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/shiboken2/ApiExtractor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/shiboken2/generator/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt index 65150eb92..4232fef66 100644 --- a/sources/shiboken2/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt @@ -84,7 +84,7 @@ endif() target_compile_definitions(apiextractor PRIVATE CMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}") -set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) +set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) if (BUILD_TESTS) find_package(Qt5Test 5.12 REQUIRED) diff --git a/sources/shiboken2/generator/CMakeLists.txt b/sources/shiboken2/generator/CMakeLists.txt index 15b965d9d..51623414b 100644 --- a/sources/shiboken2/generator/CMakeLists.txt +++ b/sources/shiboken2/generator/CMakeLists.txt @@ -30,7 +30,7 @@ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h install(TARGETS shiboken2 EXPORT Shiboken2Targets - DESTINATION bin) + DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") set(shiboken_generator_package_name "shiboken2_generator") |