make the generators not respecting DESTDIR work again

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb47f7b..6ac5b2d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,6 @@ set(CPACK_PACKAGE_VERSION_MINOR ${KATIE_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${KATIE_MICRO})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Katie")
 set(CPACK_SOURCE_IGNORE_FILES "/build/;/mingw/;/.git;${CPACK_SOURCE_IGNORE_FILES}")
-set(CPACK_SET_DESTDIR TRUE)
 set(CPACK_STRIP_FILES TRUE)
 if(WIN32 AND CMAKE_CROSSCOMPILING)
     # Windows build on non-Windows host, NSIS is not manditory on such
@@ -718,10 +717,6 @@ katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
 katie_generate_obsolete(customwidget.h QtDesginer ../QtUiTools/customwidget.h)
 katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)
 
-# translations
-file(GLOB TRANSLATIONS "translations/*.ts")
-katie_translations(${TRANSLATIONS})
-
 katie_fixup_string("${KATIE_DEFINITIONS}" KATIE_DEFINITIONS)
 
 configure_file(
@@ -736,6 +731,11 @@ configure_file(
     @ONLY
 )
 
+# translations
+katie_setup_paths()
+file(GLOB TRANSLATIONS "translations/*.ts")
+katie_translations(${TRANSLATIONS})
+
 install(
     DIRECTORY mkspecs
     DESTINATION ${CMAKE_INSTALL_PATH}

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index 6facc2e..85db39c 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -185,6 +185,38 @@ function(KATIE_SETUP_SOURCES SOURCESVAR)
     endif()
 endfunction()
 
+# a function to change full installation paths to relative so that CPack
+# generators do not choke, still paths must contain a string of some sort - if
+# they are null even quoting them will not help and CMake will complain that
+# not enought arguments have been passed to install() for DESTINATION
+function(KATIE_SETUP_PATHS)
+    if(KATIE_PLATFORM MATCHES "(win32|wince)")
+        set(CPACK_SET_DESTDIR FALSE)
+        set(instpaths
+            _PREFIX _HEADERS _LIBRARIES _BINARIES _PLUGINS _IMPORTS _DATA
+            _TRANSLATIONS _DOCUMENTATION _EXAMPLES _DEMOS _SETTINGS
+        )
+        set(miscpaths
+            CMAKE_
+        )
+        foreach(instpath ${instpaths})
+            string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" modpath "${QT${instpath}_PATH}")
+            string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" modpath "${modpath}")
+            set(QT${instpath}_PATH "${modpath}" PARENT_SCOPE)
+            # message(STATUS "QT${instpath}_PATH: ${modpath}")
+        endforeach()
+
+        foreach(instpath ${miscpaths})
+            string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" modpath "${${instpath}INSTALL_PATH}")
+            string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" modpath "${modpath}")
+            set(${instpath}INSTALL_PATH "${modpath}" PARENT_SCOPE)
+            # message(STATUS "${instpath}INSTALL_PATH: ${modpath}")
+        endforeach()
+    else()
+        set(CPACK_SET_DESTDIR TRUE)
+    endif()
+endfunction()
+
 macro(KATIE_OPTIMIZE_HEADERS DIR)
     find_program(unifdef NAMES unifdef)
     if(unifdef)

diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake
index a2712ed..0e6810e 100644 (file)
--- a/mkspecs/win32/win32.cmake
+++ b/mkspecs/win32/win32.cmake
@@ -24,8 +24,6 @@ set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos")
 # FIXME: that's incorrect, probably irrelevant once QStandardPaths are used
 set(QT_SETTINGS_PATH "${QT_DATA_PATH}/settings")
 
-set(CMAKE_INSTALL_PATH "${QT_DATA_PATH}")
-
 set(WITH_FREETYPE OFF)
 set(WITH_FONTCONFIG OFF)
 # set(WITH_ICD ON)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 9937ddf..612114b 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -365,6 +365,7 @@ katie_generate_misc("${CORE_HEADERS}" QtCore)
 katie_generate_public("${CORE_PUBLIC_HEADERS}" QtCore)
 katie_resources(${CORE_SOURCES} ${CORE_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtCore ${KATIE_TYPE} ${CORE_SOURCES} ${CORE_HEADERS})
 target_link_libraries(KtCore ${EXTRA_CORE_LIBS})

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 0be3d3f..5d701bb 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -125,6 +125,7 @@ katie_generate_misc("${DBUS_HEADERS}" QtDBus)
 katie_generate_public("${DBUS_PUBLIC_HEADERS}" QtDBus)
 katie_resources(${DBUS_SOURCES} ${DBUS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtDBus ${KATIE_TYPE} ${DBUS_SOURCES} ${DBUS_HEADERS})
 target_link_libraries(KtDBus ${EXTRA_DBUS_LIBS})

diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index 7cbea58..36ad9f3 100644 (file)
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -73,9 +73,9 @@ endif()
 
 katie_generate_misc("${DECLARATIVE_HEADERS}" QtDeclarative)
 katie_generate_public("${DECLARATIVE_PUBLIC_HEADERS}" QtDeclarative)
-katie_resources("${DECLARATIVE_SOURCES}")
-katie_resources("${DECLARATIVE_HEADERS}")
+katie_resources(${DECLARATIVE_SOURCES} ${DECLARATIVE_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtDeclarative ${KATIE_TYPE} ${DECLARATIVE_SOURCES} ${DECLARATIVE_HEADERS})
 target_link_libraries(KtDeclarative ${EXTRA_DECLARATIVE_LIBS})

diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
index f608610..198cb21 100644 (file)
--- a/src/designer/CMakeLists.txt
+++ b/src/designer/CMakeLists.txt
@@ -114,9 +114,9 @@ endif()
 
 katie_generate_misc("${DESIGNER_HEADERS}" QtDesigner)
 katie_generate_public("${DESIGNER_PUBLIC_HEADERS}" QtDesigner)
-katie_resources("${DESIGNER_SOURCES}")
-katie_resources("${DESIGNER_HEADERS}")
+katie_resources(${DESIGNER_SOURCES} ${DESIGNER_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtDesigner ${KATIE_TYPE}
     $<TARGET_OBJECTS:sharedqtgradienteditor>

diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt
index 42e438a..d82c7f9 100644 (file)
--- a/src/designer/components/CMakeLists.txt
+++ b/src/designer/components/CMakeLists.txt
@@ -79,9 +79,9 @@ endif()
 # headers go in one place!
 katie_generate_misc("${DESIGNERCOMPONENTS_HEADERS}" QtDesignerComponents)
 katie_generate_public("${DESIGNERCOMPONENTS_PUBLIC_HEADERS}" QtDesignerComponents)
-katie_resources(${DESIGNERCOMPONENTS_SOURCES})
-katie_resources(${DESIGNERCOMPONENTS_HEADERS})
+katie_resources(${DESIGNERCOMPONENTS_SOURCES} ${DESIGNERCOMPONENTS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtDesignerComponents ${KATIE_TYPE}
     $<TARGET_OBJECTS:sharedfindwidget>

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index b8faaef..645d64b 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -494,6 +494,7 @@ katie_generate_misc("${GUI_HEADERS}" QtGui)
 katie_generate_public("${GUI_PUBLIC_HEADERS}" QtGui)
 katie_resources(${GUI_SOURCES} ${GUI_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtGui ${KATIE_TYPE} ${GUI_SOURCES} ${GUI_HEADERS})
 target_link_libraries(KtGui ${EXTRA_GUI_LIBS})

diff --git a/src/help/CMakeLists.txt b/src/help/CMakeLists.txt
index 47d1aab..2068a45 100644 (file)
--- a/src/help/CMakeLists.txt
+++ b/src/help/CMakeLists.txt
@@ -91,6 +91,7 @@ katie_generate_misc("${HELP_HEADERS}" QtHelp)
 katie_generate_public("${HELP_PUBLIC_HEADERS}" QtHelp)
 katie_resources(${HELP_SOURCES} ${HELP_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtHelp ${KATIE_TYPE} ${HELP_SOURCES} ${HELP_HEADERS})
 target_link_libraries(KtHelp ${EXTRA_HELP_LIBS})

diff --git a/src/imports/folderlistmodel/folderlistmodel.cmake b/src/imports/folderlistmodel/folderlistmodel.cmake
index a001650..347a650 100644 (file)
--- a/src/imports/folderlistmodel/folderlistmodel.cmake
+++ b/src/imports/folderlistmodel/folderlistmodel.cmake
@@ -10,9 +10,9 @@ set(FOLDERLISTMODEL_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qdeclarativefolderlistmodel.h
 )
 
-katie_resources(${FOLDERLISTMODEL_SOURCES})
-katie_resources(${FOLDERLISTMODEL_HEADERS})
+katie_resources(${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(qmlfolderlistmodelplugin ${KATIE_TYPE} ${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
 target_link_libraries(qmlfolderlistmodelplugin ${EXTRA_FOLDERLISTMODEL_LIBS})

diff --git a/src/imports/gestures/gestures.cmake b/src/imports/gestures/gestures.cmake
index 8cd9f42..9536b4c 100644 (file)
--- a/src/imports/gestures/gestures.cmake
+++ b/src/imports/gestures/gestures.cmake
@@ -10,9 +10,9 @@ set(GESTURES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qdeclarativegesturearea_p.h
 )
 
-katie_resources("${GESTURES_SOURCES}")
-katie_resources("${GESTURES_HEADERS}")
+katie_resources(${GESTURES_SOURCES} ${GESTURES_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(qmlgesturesplugin ${KATIE_TYPE} ${GESTURES_SOURCES} ${GESTURES_HEADERS})
 target_link_libraries(qmlgesturesplugin ${EXTRA_GESTURES_LIBS})

diff --git a/src/imports/particles/particles.cmake b/src/imports/particles/particles.cmake
index 780add5..8ef10cb 100644 (file)
--- a/src/imports/particles/particles.cmake
+++ b/src/imports/particles/particles.cmake
@@ -13,6 +13,7 @@ set(PARTICLES_HEADERS
 katie_resources("${PARTICLES_SOURCES}")
 katie_resources("${PARTICLES_HEADERS}")
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(qmlparticlesplugin ${KATIE_TYPE} ${PARTICLES_SOURCES} ${PARTICLES_HEADERS})
 target_link_libraries(qmlparticlesplugin ${EXTRA_PARTICLES_LIBS})

diff --git a/src/imports/shaders/shaders.cmake b/src/imports/shaders/shaders.cmake
index f45c13e..eb10009 100644 (file)
--- a/src/imports/shaders/shaders.cmake
+++ b/src/imports/shaders/shaders.cmake
@@ -24,6 +24,7 @@ include_directories(${OPENGL_INCLUDE_DIR})
 
 katie_resources(${SHADERS_SOURCES} ${SHADERS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(qmlshadersplugin ${KATIE_TYPE} ${SHADERS_SOURCES} ${SHADERS_HEADERS})
 target_link_libraries(qmlshadersplugin ${EXTRA_SHADERS_LIBS})

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 0e45648..ffa1a6c 100644 (file)
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -39,9 +39,9 @@ include_directories(
 
 katie_generate_misc("${MULTIMEDIA_HEADERS}" QtMultimedia)
 katie_generate_public("${MULTIMEDIA_PUBLIC_HEADERS}" QtMultimedia)
-katie_resources("${MULTIMEDIA_SOURCES}")
-katie_resources("${MULTIMEDIA_HEADERS}")
+katie_resources(${MULTIMEDIA_SOURCES} ${MULTIMEDIA_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtMultimedia ${KATIE_TYPE} ${MULTIMEDIA_SOURCES} ${MULTIMEDIA_HEADERS})
 target_link_libraries(KtMultimedia ${EXTRA_MULTIMEDIA_LIBS})

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 67fc259..9ae1bfc 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -85,6 +85,7 @@ katie_generate_misc("${NETWORK_HEADERS}" QtNetwork)
 katie_generate_public("${NETWORK_PUBLIC_HEADERS}" QtNetwork)
 katie_resources(${NETWORK_SOURCES} ${NETWORK_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtNetwork ${KATIE_TYPE} ${NETWORK_SOURCES} ${NETWORK_HEADERS})
 target_link_libraries(KtNetwork ${EXTRA_NETWORK_LIBS})

diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 4d9dc27..ffd8db9 100644 (file)
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -191,6 +191,7 @@ katie_generate_misc("${OPENGL_HEADERS}" QtOpenGL)
 katie_generate_public("${OPENGL_PUBLIC_HEADERS}" QtOpenGL)
 katie_resources(${OPENGL_SOURCES} ${OPENGL_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtOpenGL ${KATIE_TYPE} ${OPENGL_SOURCES} ${OPENGL_HEADERS})
 target_link_libraries(KtOpenGL ${EXTRA_OPENGL_LIBS})

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 62742d9..6031f94 100644 (file)
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -2,6 +2,7 @@ add_definitions(-DQT_PLUGIN)
 set(EXTRA_PLUGINS_LIBS KtCore)
 
 katie_setup_flags()
+katie_setup_paths()
 
 include_directories(
     ${CMAKE_BINARY_DIR}/include

diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index a84584d..f7c3e9a 100644 (file)
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -271,6 +271,7 @@ katie_generate_misc("${SCRIPT_HEADERS}" QtScript)
 katie_generate_public("${SCRIPT_PUBLIC_HEADERS}" QtScript)
 katie_resources(${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtScript ${KATIE_TYPE} ${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
 target_link_libraries(KtScript ${EXTRA_SCRIPT_LIBS})

diff --git a/src/scripttools/CMakeLists.txt b/src/scripttools/CMakeLists.txt
index 1584bfd..eb25753 100644 (file)
--- a/src/scripttools/CMakeLists.txt
+++ b/src/scripttools/CMakeLists.txt
@@ -27,6 +27,7 @@ katie_generate_misc("${SCRIPTTOOLS_HEADERS}" QtScriptTools)
 katie_generate_public("${SCRIPTTOOLS_PUBLIC_HEADERS}" QtScriptTools)
 katie_resources(${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtScriptTools ${KATIE_TYPE} ${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS})
 target_link_libraries(KtScriptTools ${EXTRA_SCRIPTTOOLS_LIBS})

diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index c75816f..ad97b5a 100644 (file)
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -38,6 +38,8 @@ set(SQL_PUBLIC_HEADERS
     QTDSResult
 )
 
+# exception because drivers are installed from sub-directories
+katie_setup_paths()
 include(kernel/kernel.cmake)
 # TODO: include(drivers/ibase/ibase.cmake)
 if(WITH_MYSQL AND MYSQL_FOUND)
@@ -78,6 +80,7 @@ katie_generate_misc("${SQL_HEADERS}" QtSql)
 katie_generate_public("${SQL_PUBLIC_HEADERS}" QtSql)
 katie_resources(${SQL_SOURCES} ${SQL_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtSql ${KATIE_TYPE} ${SQL_SOURCES} ${SQL_HEADERS})
 target_link_libraries(KtSql ${EXTRA_SQL_LIBS})

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index c10b7fe..7687296 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -72,6 +72,7 @@ katie_generate_misc("${SVG_HEADERS}" QtSvg)
 katie_generate_public("${SVG_PUBLIC_HEADERS}" QtSvg)
 katie_resources(${SVG_SOURCES} ${SVG_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtSvg ${KATIE_TYPE} ${SVG_SOURCES} ${SVG_HEADERS})
 target_link_libraries(KtSvg ${EXTRA_SVG_LIBS})

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 26e9ae3..7bb7bc8 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -131,6 +131,7 @@ katie_generate_misc("${TEST_HEADERS}" QtTest)
 katie_generate_public("${TEST_PUBLIC_HEADERS}" QtTest)
 katie_resources(${TEST_SOURCES} ${TEST_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtTest ${KATIE_TYPE} ${TEST_SOURCES} ${TEST_HEADERS})
 target_link_libraries(KtTest ${EXTRA_TEST_LIBS})

diff --git a/src/tools/designer/CMakeLists.txt b/src/tools/designer/CMakeLists.txt
index 67b6323..bf7c7b1 100644 (file)
--- a/src/tools/designer/CMakeLists.txt
+++ b/src/tools/designer/CMakeLists.txt
@@ -97,6 +97,7 @@ endif()
 
 katie_resources(${DESIGNERBIN_SOURCES} ${DESIGNERBIN_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(designer
     WIN32 # TODO: MACOSX_BUNDLE

diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
index 48f489a..42dd7b0 100644 (file)
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -14,6 +14,7 @@ set(IDC_SOURCES
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(idc ${IDC_SOURCES})
 target_link_libraries(idc ${EXTRA_IDC_LIBS})

diff --git a/src/tools/lconvert/CMakeLists.txt b/src/tools/lconvert/CMakeLists.txt
index bdeea54..9d33c24 100644 (file)
--- a/src/tools/lconvert/CMakeLists.txt
+++ b/src/tools/lconvert/CMakeLists.txt
@@ -26,6 +26,7 @@ set(LCONVERT_HEADERS
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(lconvert $<TARGET_OBJECTS:sharedlinguist> ${LCONVERT_SOURCES} ${LCONVERT_HEADERS})
 target_link_libraries(lconvert ${EXTRA_LCONVERT_LIBS})

diff --git a/src/tools/lrelease/CMakeLists.txt b/src/tools/lrelease/CMakeLists.txt
index 3bd22ef..2a48b9b 100644 (file)
--- a/src/tools/lrelease/CMakeLists.txt
+++ b/src/tools/lrelease/CMakeLists.txt
@@ -26,6 +26,7 @@ set(LRELEASE_HEADERS
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(lrelease $<TARGET_OBJECTS:sharedlinguist> ${LRELEASE_SOURCES} ${LRELEASE_HEADERS})
 target_link_libraries(lrelease ${EXTRA_LRELEASE_LIBS})

diff --git a/src/tools/lupdate/CMakeLists.txt b/src/tools/lupdate/CMakeLists.txt
index 83de5a4..a484f39 100644 (file)
--- a/src/tools/lupdate/CMakeLists.txt
+++ b/src/tools/lupdate/CMakeLists.txt
@@ -27,6 +27,7 @@ set(LUPDATE_HEADERS
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(lupdate $<TARGET_OBJECTS:sharedlinguist> ${LUPDATE_SOURCES} ${LUPDATE_HEADERS})
 target_link_libraries(lupdate ${EXTRA_LUPDATE_LIBS})

diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index f5752a4..ad23420 100644 (file)
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -31,6 +31,7 @@ if(KATIE_PLATFORM STREQUAL "mac")
 endif()
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(bootstrap_moc $<TARGET_OBJECTS:bootstrap> ${MOC_SOURCES})
 target_compile_definitions(bootstrap_moc PRIVATE ${BOOTSTRAP_DEFINITIONS})

diff --git a/src/tools/qcollectiongenerator/CMakeLists.txt b/src/tools/qcollectiongenerator/CMakeLists.txt
index 2740656..31d3e5b 100644 (file)
--- a/src/tools/qcollectiongenerator/CMakeLists.txt
+++ b/src/tools/qcollectiongenerator/CMakeLists.txt
@@ -27,9 +27,9 @@ set(QCOLLECTIONGENERATOR_HEADERS
     ${SHAREDHELP_HEADERS}
 )
 
-katie_resources("${QCOLLECTIONGENERATOR_SOURCES}")
-katie_resources("${QCOLLECTIONGENERATOR_HEADERS}")
+katie_resources(${QCOLLECTIONGENERATOR_SOURCES} ${QCOLLECTIONGENERATOR_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(qcollectiongenerator $<TARGET_OBJECTS:sharedhelp> ${QCOLLECTIONGENERATOR_SOURCES} ${QCOLLECTIONGENERATOR_HEADERS})
 target_link_libraries(qcollectiongenerator ${EXTRA_QCOLLECTIONGENERATOR_LIBS})

diff --git a/src/tools/qdbus/CMakeLists.txt b/src/tools/qdbus/CMakeLists.txt
index 3ba4781..c478095 100644 (file)
--- a/src/tools/qdbus/CMakeLists.txt
+++ b/src/tools/qdbus/CMakeLists.txt
@@ -13,6 +13,7 @@ include_directories(
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(qdbus ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.cpp)
 target_link_libraries(qdbus ${EXTRA_QDBUS_LIBS})

diff --git a/src/tools/qdbusviewer/CMakeLists.txt b/src/tools/qdbusviewer/CMakeLists.txt
index 49061be..cd488b8 100644 (file)
--- a/src/tools/qdbusviewer/CMakeLists.txt
+++ b/src/tools/qdbusviewer/CMakeLists.txt
@@ -39,6 +39,7 @@ endif()
 
 katie_resources(${QDBUSVIEWER_SOURCES} ${QDBUSVIEWER_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(qdbusviewer
     WIN32 # TODO: MACOSX_BUNDLE

diff --git a/src/tools/qhelpgenerator/CMakeLists.txt b/src/tools/qhelpgenerator/CMakeLists.txt
index 27efe35..0a69c42 100644 (file)
--- a/src/tools/qhelpgenerator/CMakeLists.txt
+++ b/src/tools/qhelpgenerator/CMakeLists.txt
@@ -25,9 +25,9 @@ set(QHELPGENERATOR_HEADERS
     ${SHAREDHELP_HEADERS}
 )
 
-katie_resources("${QHELPGENERATOR_SOURCES}")
-katie_resources("${QHELPGENERATOR_HEADERS}")
+katie_resources(${QHELPGENERATOR_SOURCES} ${QHELPGENERATOR_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(qhelpgenerator $<TARGET_OBJECTS:sharedhelp> ${QHELPGENERATOR_SOURCES} ${QHELPGENERATOR_HEADERS})
 target_link_libraries(qhelpgenerator ${EXTRA_QHELPGENERATOR_LIBS})

diff --git a/src/tools/qscript/CMakeLists.txt b/src/tools/qscript/CMakeLists.txt
index 3d70e49..8ef6254 100644 (file)
--- a/src/tools/qscript/CMakeLists.txt
+++ b/src/tools/qscript/CMakeLists.txt
@@ -23,6 +23,7 @@ set(QSCRIPT_HEADERS
 
 katie_resources(${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(qscript ${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
 target_link_libraries(qscript ${EXTRA_QTSCRIPT_LIBS})

diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index b2d5dde..f41ba49 100644 (file)
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -22,6 +22,7 @@ set(RCC_HEADERS
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(rcc ${RCC_SOURCES} ${RCC_HEADERS})
 target_link_libraries(rcc ${EXTRA_RCC_LIBS})

diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index b5b15f7..bed0661 100644 (file)
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -28,6 +28,7 @@ set(UIC_SOURCES
 )
 
 katie_setup_flags()
+katie_setup_paths()
 
 add_executable(uic ${UIC_SOURCES})
 target_link_libraries(uic ${EXTRA_UIC_LIBS})

diff --git a/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt
index 09f9ccc..54677b9 100644 (file)
--- a/src/uitools/CMakeLists.txt
+++ b/src/uitools/CMakeLists.txt
@@ -59,6 +59,7 @@ katie_generate_misc("${UITOOLS_HEADERS}" QtUiTools)
 katie_generate_public("${UITOOLS_PUBLIC_HEADERS}" QtUiTools)
 katie_resources(${UITOOLS_SOURCES} ${UITOOLS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtUiTools ${KATIE_TYPE} ${UITOOLS_SOURCES} ${UITOOLS_HEADERS})
 target_link_libraries(KtUiTools ${EXTRA_UITOOLS_LIBS})

diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
index ecedb38..c24ab09 100644 (file)
--- a/src/winmain/CMakeLists.txt
+++ b/src/winmain/CMakeLists.txt
@@ -14,6 +14,7 @@ set(MAIN_SOURCES
 
 katie_resources(${MAIN_SOURCES})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtMain ${MAIN_SOURCES} ${MAIN_HEADERS})
 target_link_libraries(KtMain ${EXTRA_MAIN_LIBS})

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index f6a2337..6311c7d 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -74,6 +74,7 @@ katie_generate_misc("${XML_HEADERS}" QtXml)
 katie_generate_public("${XML_PUBLIC_HEADERS}" QtXml)
 katie_resources(${XML_SOURCES} ${XML_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 add_library(KtXml ${KATIE_TYPE} ${XML_SOURCES} ${XML_HEADERS})
 target_link_libraries(KtXml ${EXTRA_XML_LIBS})

diff --git a/src/xmlpatterns/CMakeLists.txt b/src/xmlpatterns/CMakeLists.txt
index 371c901..76a1b3c 100644 (file)
--- a/src/xmlpatterns/CMakeLists.txt
+++ b/src/xmlpatterns/CMakeLists.txt
@@ -76,6 +76,7 @@ katie_generate_misc("${XMLPATTERNS_HEADERS}" QtXmlPatterns)
 katie_generate_public("${XMLPATTERNS_PUBLIC_HEADERS}" QtXmlPatterns)
 katie_resources(${XMLPATTERNS_SOURCES} ${XMLPATTERNS_HEADERS})
 katie_setup_flags()
+katie_setup_paths()
 
 # the component requires exceptions
 if(NOT KATIE_PLATFORM STREQUAL "win32")