diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-23 12:41:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-23 12:41:53 +0100 |
| commit | b6a8c64e3a98808cd0a237b5480c5db307074890 (patch) | |
| tree | 6f292aed31bd3896aa089c74d9e7f3b1b1967f5f | |
| parent | e3e3caeba4aebd68dc301b23e89dc4f78d708d15 (diff) | |
| parent | 9eb8b56f6a1a23d57a76f525a534f35761954217 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I078da867fab3fbc4fe6c02753137f8f13500a125
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bb2f9c..1fa5fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +# Does not work with ninja on Win32. +if (NOT (WIN32 AND CMAKE_GENERATOR STREQUAL "Ninja")) set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${pyside2_tools_VERSION}) add_custom_target(dist COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}" && @@ -74,6 +76,7 @@ add_custom_target(dist bzip2 -f9 "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar" && echo "Source package created at ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2.\n" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() set(PYSIDE2RCC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/pyrcc/pyside2-rcc) add_subdirectory(pyrcc) |