aboutsummaryrefslogtreecommitdiffstats
path: root/share/CMakeLists.txt
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-11-29 12:58:47 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-12-03 10:10:20 +0000
commitc21932163779bcfe4577ac2e3326b8c113884829 (patch)
treef6a8f53f32b18bc73858817f71399c69fa941823 /share/CMakeLists.txt
parent578b6d6978d7b42baefd85277c0d332f36142c65 (diff)
cmake: Fix building documentation
It was never implemented Fixes: QBS-1618 Change-Id: I702410b546cacd439989268d3d4fbb18051d1819 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/CMakeLists.txt')
-rw-r--r--share/CMakeLists.txt23
1 files changed, 9 insertions, 14 deletions
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index bfc657b6f..a617dbd75 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -32,32 +32,27 @@ install(
DESTINATION "${QBS_RESOURCES_INSTALL_DIR}/qbs"
)
-if(WIN32)
- get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_RELEASE)
- if(NOT _QTCORE_LIBRARY)
- get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_DEBUG)
- endif()
- get_filename_component(_QT_LIBRARY_PATH "${_QTCORE_LIBRARY}" DIRECTORY)
- get_target_property(_QBS_LIBRARY_PATH qbscore LIBRARY_OUTPUT_DIRECTORY)
- set(UPDATE_PATH_COMMAND set "PATH=${_QT_LIBRARY_PATH}\;${_QBS_LIBRARY_PATH}\;%PATH%")
-else()
- set(UPDATE_PATH_COMMAND "")
-endif()
-
get_target_property(_QBS_OUTPUT_DIR qbs RUNTIME_OUTPUT_DIRECTORY)
add_custom_target(
BuildQbsResources ALL
COMMAND ${UPDATE_PATH_COMMAND}
COMMAND ${_QBS_OUTPUT_DIR}/qbs
- build
+ resolve
--settings-dir ${PROJECT_BINARY_DIR}/settings
-f ${PROJECT_SOURCE_DIR}/qbs.qbs
-d ${PROJECT_BINARY_DIR}/
- -p "qbs resources"
+ config:resources-build
qbs.installPrefix:undefined
project.withCode:false
project.withDocumentation:false
profile:none
+ COMMAND ${_QBS_OUTPUT_DIR}/qbs
+ build
+ --settings-dir ${PROJECT_BINARY_DIR}/settings
+ -f ${PROJECT_SOURCE_DIR}/qbs.qbs
+ -d ${PROJECT_BINARY_DIR}/
+ config:resources-build
+ -p "qbs resources"
DEPENDS qbs copy-runtime-files-qbs
)