cmake: Make build output & install locations configurable

So we can configure the right paths for direct inclusion in the Qt
Creator build.

Change-Id: Ie83eb402f0d9ce5f1ef32737921dc2ec8b43a315
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

1 files changed, 16 insertions, 21 deletions

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index fca6c5147..8f53804fd 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1,9 +1,3 @@
-if(QBS_RESOURCES_INSTALL_DIR)
-    set(QBS_SHARE_DIR "${QBS_RESOURCES_INSTALL_DIR}/share")
-else()
-    set(QBS_SHARE_DIR "share")
-endif()
-
 if(WIN32)
     install(
         FILES ../bin/ibmsvc.xml ../bin/ibqbs.bat
@@ -12,30 +6,30 @@ if(WIN32)
 endif()
 install(
     PROGRAMS ../src/3rdparty/python/bin/dmgbuild
-    DESTINATION "${QBS_LIBEXEC_PATH}"
+    DESTINATION "${QBS_LIBEXEC_INSTALL_DIR}"
     )
 add_custom_target(copy-runtime-files-dmgbuild ALL
     COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_SOURCE_DIR}/../src/3rdparty/python/bin/dmgbuild
-        ${CMAKE_BINARY_DIR}/${QBS_LIBEXEC_PATH}
+        ${CMAKE_BINARY_DIR}/${QBS_OUTPUT_PREFIX}${QBS_LIBEXEC_INSTALL_DIR}
     )
 install(
     # trailing slash avoid copying the 'site-packages' dir and only copies its content
     DIRECTORY ../src/3rdparty/python/lib/python2.7/site-packages/
-    DESTINATION "${QBS_SHARE_DIR}/qbs/python"
+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}/qbs/python"
     FILES_MATCHING PATTERN "*.py"
     )
 install(
     DIRECTORY qbs
-    DESTINATION "${QBS_SHARE_DIR}")
+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}")
 add_custom_target(copy-runtime-files-qbs ALL
     COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${CMAKE_CURRENT_SOURCE_DIR}/qbs
-        ${CMAKE_BINARY_DIR}/share/qbs
+        ${CMAKE_BINARY_DIR}/${QBS_OUTPUT_PREFIX}${QBS_RESOURCES_INSTALL_DIR}/qbs
     )
 install(
     DIRECTORY ../examples
-    DESTINATION "${QBS_SHARE_DIR}/qbs"
+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}/qbs"
     )
 
 if(WIN32)
@@ -44,28 +38,29 @@ 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 ${CMAKE_BINARY_DIR}/${QBS_APP_INSTALL_DIR}/qbs
+    COMMAND ${_QBS_OUTPUT_DIR}/qbs
         build
-        --settings-dir ${CMAKE_BINARY_DIR}/settings
-        -f ${CMAKE_SOURCE_DIR}/qbs.qbs
-        -d ${CMAKE_BINARY_DIR}/
+        --settings-dir ${PROJECT_BINARY_DIR}/settings
+        -f ${PROJECT_SOURCE_DIR}/qbs.qbs
+        -d ${PROJECT_BINARY_DIR}/
         -p "qbs resources"
         qbs.installPrefix:undefined
         project.withCode:false
         project.withDocumentation:false
         profile:none
-    DEPENDS qbs
+    DEPENDS qbs copy-runtime-files-qbs
     )
 
 install(
-    DIRECTORY ${CMAKE_BINARY_DIR}/default/install-root/share/qbs/qml-type-descriptions
-    DESTINATION "${QBS_SHARE_DIR}/qbs"
+    DIRECTORY ${PROJECT_BINARY_DIR}/default/install-root/share/qbs/qml-type-descriptions
+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}/qbs"
     )
 
 install(
-    DIRECTORY ${CMAKE_BINARY_DIR}/default/install-root/share/qbs/qml-type-descriptions
-    DESTINATION "${QBS_SHARE_DIR}/qbs"
+    DIRECTORY ${PROJECT_BINARY_DIR}/default/install-root/share/qbs/qml-type-descriptions
+    DESTINATION "${QBS_RESOURCES_INSTALL_DIR}/qbs"
     )