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

Utils: clean up CMake code

Browse Source 
Re-use an existing variable, which contains the same information.

Change-Id: I1daa6428d67f11dd2efccd43ff6bab76420236ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-02-26 13:09:02 +01:00
parent 3a52269a1d
commit be2da106ee
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/CMakeLists.txt
View File

@@ -1,19 +1,8 @@
if (IDE_LIBEXEC_PATH AND IDE_BIN_PATH)
get_filename_component(bin_path
"${CMAKE_INSTALL_PREFIX}/${IDE_BIN_PATH}" ABSOLUTE "${CMAKE_BINARY_DIR}")
get_filename_component(libexec_path
"${CMAKE_INSTALL_PREFIX}/${IDE_LIBEXEC_PATH}" ABSOLUTE "${CMAKE_BINARY_DIR}")
file(RELATIVE_PATH RELATIVE_TOOLS_PATH "${bin_path}" "${libexec_path}")
else()
message(WARNING "IDE_LIBEXEC_PATH or IDE_BIN_PATH undefined when calculating tools path")
set(RELATIVE_TOOLS_PATH "")
endif()
add_qtc_library(Utils add_qtc_library(Utils
DEPENDS Qt5::Xml DEPENDS Qt5::Xml
PUBLIC_DEPENDS Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Qml Qt5::Gui Qt5::Widgets PUBLIC_DEPENDS Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Qml Qt5::Gui Qt5::Widgets
DEFINES DEFINES
"QTC_REL_TOOLS_PATH=\"${RELATIVE_TOOLS_PATH}\"" "QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\""
SOURCES SOURCES
../3rdparty/optional/optional.hpp ../3rdparty/optional/optional.hpp
../3rdparty/variant/variant.hpp ../3rdparty/variant/variant.hpp