CMake build: Make sdktool use parts of Utils

Change-Id: I88ab8ab89951bb8966fcc48b7d4ee416015ab8e5
Fixes: QTCREATORBUG-22550
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2019-06-11 17:51:17 +02:00
committed by Cristian Adam
parent a093dfc65c
commit 25bd5976ba

View File

@@ -1,8 +1,9 @@
# TODO: Do not depend on Utils! Include relevant files instead. get_target_property(UtilsSourcesDir Utils SOURCES_DIR)
add_qtc_executable(sdktool add_qtc_executable(sdktool
DEFINES DATA_PATH=\"${IDE_DATA_PATH}\" DEFINES DATA_PATH=\"${IDE_DATA_PATH}\"
DEPENDS Qt5::Core Utils app_version DEPENDS Qt5::Core app_version
INCLUDES "${UtilsSourcesDir}/../"
SOURCES SOURCES
addabiflavor.cpp addabiflavor.h addabiflavor.cpp addabiflavor.h
addcmakeoperation.cpp addcmakeoperation.h addcmakeoperation.cpp addcmakeoperation.h
@@ -26,3 +27,33 @@ add_qtc_executable(sdktool
rmtoolchainoperation.cpp rmtoolchainoperation.h rmtoolchainoperation.cpp rmtoolchainoperation.h
settings.cpp settings.h settings.cpp settings.h
) )
extend_qtc_target(sdktool
SOURCES_PREFIX "${UtilsSourcesDir}"
DEFINES QTCREATOR_UTILS_STATIC_LIB
SOURCES
environment.cpp environment.h
fileutils.cpp fileutils.h
hostosinfo.cpp hostosinfo.h
persistentsettings.cpp persistentsettings.h
qtcassert.cpp qtcassert.h
qtcprocess.cpp qtcprocess.h
savefile.cpp savefile.h
stringutils.cpp stringutils.h
)
extend_qtc_target(sdktool CONDITION APPLE
SOURCES_PREFIX "${UtilsSourcesDir}"
SOURCES
fileutils_mac.mm fileutils_mac.h
DEPENDS
${FWFoundation}
)
extend_qtc_target(sdktool CONDITION WIN32
DEPENDS
user32 iphlpapi ws2_32 shell32
DEFINES
_UNICODE UNICODE
_CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS
)