feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Fix sdktool location for standalone build

Browse Source 
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>
This commit is contained in:
Eike Ziller
2020-01-31 14:05:50 +01:00
parent f29f219579
commit e79d35228a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/sdktool/CMakeLists.txt
View File

@@ -11,8 +11,13 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
include(QtCreatorIDEBranding) if (NOT QT_CREATOR_API_DEFINED)
include(QtCreatorAPI) # standalone build
set(DESTINATION DESTINATION .)
include(QtCreatorIDEBranding)
include(QtCreatorAPI)
endif()
configure_file(../../app/app_version.h.cmakein app/app_version.h ESCAPE_QUOTES) configure_file(../../app/app_version.h.cmakein app/app_version.h ESCAPE_QUOTES)
find_package(Qt5 find_package(Qt5
@@ -27,6 +32,7 @@ endif()
set(UtilsSourcesDir "../../libs/utils") set(UtilsSourcesDir "../../libs/utils")
add_qtc_executable(sdktool add_qtc_executable(sdktool
${DESTINATION}
DEFINES DATA_PATH=\"${IDE_DATA_PATH}\" DEFINES DATA_PATH=\"${IDE_DATA_PATH}\"
DEPENDS Qt5::Core DEPENDS Qt5::Core
INCLUDES INCLUDES