From 9eb8b56f6a1a23d57a76f525a534f35761954217 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 22 Nov 2018 16:21:05 +0100 Subject: Exclude the ChangeLog generation target for Ninja on Windows It generates an invalid command and won't work anyways. Change-Id: I1434f4e232690fe5f2bcfff41772c8e267f47304 Reviewed-by: Cristian Maureira-Fredes --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) 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) -- cgit v1.2.3