diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-14 15:07:08 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-14 15:07:35 +0200 |
commit | feed085ce82fc6dd75d0c9ed99745267e01e6c80 (patch) | |
tree | b3bc9be0319a972d1fdd70fc4171a5ed5fe74007 /sources/shiboken2/tests | |
parent | ec6da06e18f90778080f4b59df503789e8165120 (diff) | |
parent | 5337435edaa10518c4495d480f934e87b2ccd444 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I1dd2958b252b82e8699e8d2212afdce0086a16d2
Diffstat (limited to 'sources/shiboken2/tests')
4 files changed, 7 insertions, 0 deletions
diff --git a/sources/shiboken2/tests/minimalbinding/CMakeLists.txt b/sources/shiboken2/tests/minimalbinding/CMakeLists.txt index fb0b2cc74..7edb0290a 100644 --- a/sources/shiboken2/tests/minimalbinding/CMakeLists.txt +++ b/sources/shiboken2/tests/minimalbinding/CMakeLists.txt @@ -29,6 +29,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${libshiboken_SOURCE_DIR}) add_library(minimal MODULE ${minimal_SRC}) set_property(TARGET minimal PROPERTY PREFIX "") +set_property(TARGET minimal PROPERTY OUTPUT_NAME "minimal${PYTHON_EXTENSION_SUFFIX}") if(WIN32) set_property(TARGET minimal PROPERTY SUFFIX ".pyd") endif() diff --git a/sources/shiboken2/tests/otherbinding/CMakeLists.txt b/sources/shiboken2/tests/otherbinding/CMakeLists.txt index ac7178e5d..7d4dd5b55 100644 --- a/sources/shiboken2/tests/otherbinding/CMakeLists.txt +++ b/sources/shiboken2/tests/otherbinding/CMakeLists.txt @@ -35,6 +35,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${libshiboken_SOURCE_DIR}) add_library(other MODULE ${other_SRC}) set_property(TARGET other PROPERTY PREFIX "") +set_property(TARGET other PROPERTY OUTPUT_NAME "other${PYTHON_EXTENSION_SUFFIX}") + if(WIN32) set_property(TARGET other PROPERTY SUFFIX ".pyd") endif() diff --git a/sources/shiboken2/tests/samplebinding/CMakeLists.txt b/sources/shiboken2/tests/samplebinding/CMakeLists.txt index f897712f4..1b97bd0e8 100644 --- a/sources/shiboken2/tests/samplebinding/CMakeLists.txt +++ b/sources/shiboken2/tests/samplebinding/CMakeLists.txt @@ -136,6 +136,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${libshiboken_SOURCE_DIR}) add_library(sample MODULE ${sample_SRC}) set_property(TARGET sample PROPERTY PREFIX "") +set_property(TARGET sample PROPERTY OUTPUT_NAME "sample${PYTHON_EXTENSION_SUFFIX}") + if(WIN32) set_property(TARGET sample PROPERTY SUFFIX ".pyd") endif() diff --git a/sources/shiboken2/tests/smartbinding/CMakeLists.txt b/sources/shiboken2/tests/smartbinding/CMakeLists.txt index e9c52d447..aab2121d3 100644 --- a/sources/shiboken2/tests/smartbinding/CMakeLists.txt +++ b/sources/shiboken2/tests/smartbinding/CMakeLists.txt @@ -30,6 +30,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${libshiboken_SOURCE_DIR}) add_library(smart MODULE ${smart_SRC}) set_property(TARGET smart PROPERTY PREFIX "") +set_property(TARGET smart PROPERTY OUTPUT_NAME "smart${PYTHON_EXTENSION_SUFFIX}") + if(WIN32) set_property(TARGET smart PROPERTY SUFFIX ".pyd") endif() |