From 28a8516394bbb78361fcfadbcd599d6159904102 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 22 Feb 2021 14:23:23 +0100 Subject: [PATCH] CMake build: Make it possible to separately build wininterrupt & cdbext By making them separate projects. Follow the pattern from sdktool. This is needed for building these tools on Windows 32bit for the Qt6-based installers - because Qt 6 doesn't provide Windows 32bit builds anymore. Change-Id: I82e2fdc7312e95079bb13f8c5f0ac1028c09222f Reviewed-by: Cristian Adam --- src/libs/qtcreatorcdbext/CMakeLists.txt | 20 +++++++++++++++++++- src/tools/wininterrupt/CMakeLists.txt | 16 ++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt index ddffac17e3f..c2a7c60a2ef 100644 --- a/src/libs/qtcreatorcdbext/CMakeLists.txt +++ b/src/libs/qtcreatorcdbext/CMakeLists.txt @@ -1,3 +1,19 @@ +cmake_minimum_required(VERSION 3.10) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake") + +project(qtcreatorcdbext) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + +if (NOT QT_CREATOR_API_DEFINED) + # standalone build + include(QtCreatorIDEBranding) + include(QtCreatorAPI) +endif() + if (NOT WIN32 OR NOT MSVC) return() endif() @@ -111,8 +127,10 @@ if (_library_enabled) COMPONENT qtcreatorcdbext) add_custom_target(copy_python_dll ALL VERBATIM) + + qtc_output_binary_dir(output_binary_dir) add_custom_command(TARGET copy_python_dll POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${deployPythonFiles} "${PROJECT_BINARY_DIR}/lib/qtcreatorcdbext${ArchSuffix}/" + COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${deployPythonFiles} "${output_binary_dir}/lib/qtcreatorcdbext${ArchSuffix}/" VERBATIM ) endif() diff --git a/src/tools/wininterrupt/CMakeLists.txt b/src/tools/wininterrupt/CMakeLists.txt index f87825ed8e8..b16e2e1e65b 100644 --- a/src/tools/wininterrupt/CMakeLists.txt +++ b/src/tools/wininterrupt/CMakeLists.txt @@ -1,3 +1,19 @@ +cmake_minimum_required(VERSION 3.10) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake") + +project(wininterrupt) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + +if (NOT QT_CREATOR_API_DEFINED) + # standalone build + include(QtCreatorIDEBranding) + include(QtCreatorAPI) +endif() + if (NOT WIN32) return() endif()