From e79d35228a128fda52a010dacea4d83317d980f0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 31 Jan 2020 14:05:50 +0100 Subject: [PATCH] CMake build: Fix sdktool location for standalone build Avoid the path to libexec inside the Qt Creator bundle if building sdktool standalone Change-Id: Id893a523d262b846cbbed7d73fa28751e404102a Reviewed-by: Cristian Adam --- src/tools/sdktool/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/tools/sdktool/CMakeLists.txt b/src/tools/sdktool/CMakeLists.txt index d9f5f9fb3cd..2c0c60b92ac 100644 --- a/src/tools/sdktool/CMakeLists.txt +++ b/src/tools/sdktool/CMakeLists.txt @@ -11,8 +11,13 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -include(QtCreatorIDEBranding) -include(QtCreatorAPI) +if (NOT QT_CREATOR_API_DEFINED) + # standalone build + set(DESTINATION DESTINATION .) + include(QtCreatorIDEBranding) + include(QtCreatorAPI) +endif() + configure_file(../../app/app_version.h.cmakein app/app_version.h ESCAPE_QUOTES) find_package(Qt5 @@ -27,6 +32,7 @@ endif() set(UtilsSourcesDir "../../libs/utils") add_qtc_executable(sdktool + ${DESTINATION} DEFINES DATA_PATH=\"${IDE_DATA_PATH}\" DEPENDS Qt5::Core INCLUDES