diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-06-22 15:42:52 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-06-23 08:28:06 +0000 |
commit | afaaaea6dfc5ad5f521f273b1e10afb623051af0 (patch) | |
tree | f908074c1e7e1b7486022f31c11ed268b4e10765 | |
parent | bb20af87923fdd2c900db923d1c519b772b1faf1 (diff) |
Remove incorrect dependency in pysidetest target
Even though the final library name is libpyside, the actual target
that generates that file is called pyside2, as indicated by the
project(pyside2) command in the CMakeLists.txt file.
Also set the CMake policy of not ignoring incorrect dependencies.
Change-Id: Iba65dfd5fe7e34e7557c756a838017fe48f0ffd5
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 3 | ||||
-rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 6c5691d01..1c0c5c93e 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -3,6 +3,9 @@ include(cmake/Macros/icecc.cmake) # this must be the first line! cmake_minimum_required(VERSION 3.0) cmake_policy(VERSION 3.0) +# Don't ignore targets that do not exist, inside add_dependencies calls. +cmake_policy(SET CMP0046 NEW) + project(pysidebindings) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Macros/ diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 0b1902ff0..6236dab3b 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -98,7 +98,7 @@ target_link_libraries(testbinding ${Qt5Widgets_LIBRARIES} ${SBK_PYTHON_LIBRARIES}) -add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets libpyside pysidetest) +add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets pysidetest) PYSIDE_TEST(decoratedslot_test.py) PYSIDE_TEST(delegatecreateseditor_test.py) |