aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-01-31 14:05:50 +0100
committerEike Ziller <eike.ziller@qt.io>2020-01-31 13:44:21 +0000
commite79d35228a128fda52a010dacea4d83317d980f0 (patch)
tree37b0401fdb74c22ceb997a5846ce56411d9f790f /src/tools
parentf29f219579ef3e832d128bfc3a3e51e0bd203de9 (diff)
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 <cristian.adam@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/sdktool/CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/sdktool/CMakeLists.txt b/src/tools/sdktool/CMakeLists.txt
index d9f5f9fb3c..2c0c60b92a 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