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

CMake build system for sdktool: use extend_qtc_executable

Browse Source 
Use extend_qtc_executable instead of extend_qtc_target.

In addition to using the correct function, this also allows to
configure Qt Creator without sdktool. extend_qtc_target does not
(yet) handle disabled targets, properly.

Change-Id: Ie99f158a814c14b3e207d6ca720da074671ac9a8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2019-09-17 13:48:08 +02:00
parent a03074e139
commit 93ed44bfea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ add_qtc_executable(sdktool
settings.cpp settings.h settings.cpp settings.h
) )
extend_qtc_target(sdktool extend_qtc_executable(sdktool
SOURCES_PREFIX "${UtilsSourcesDir}" SOURCES_PREFIX "${UtilsSourcesDir}"
DEFINES QTCREATOR_UTILS_STATIC_LIB DEFINES QTCREATOR_UTILS_STATIC_LIB
SOURCES SOURCES
@@ -45,7 +45,7 @@ extend_qtc_target(sdktool
stringutils.cpp stringutils.h stringutils.cpp stringutils.h
) )
extend_qtc_target(sdktool CONDITION APPLE extend_qtc_executable(sdktool CONDITION APPLE
SOURCES_PREFIX "${UtilsSourcesDir}" SOURCES_PREFIX "${UtilsSourcesDir}"
SOURCES SOURCES
fileutils_mac.mm fileutils_mac.h fileutils_mac.mm fileutils_mac.h
@@ -53,7 +53,7 @@ extend_qtc_target(sdktool CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
extend_qtc_target(sdktool CONDITION WIN32 extend_qtc_executable(sdktool CONDITION WIN32
DEPENDS DEPENDS
user32 iphlpapi ws2_32 shell32 user32 iphlpapi ws2_32 shell32
DEFINES DEFINES