simplify installation directories handling via use of CPACK_SET_DESTDIR

also, the CMake files are installed where they can be found by default
(without any manual configuration) by default - in the top-level
installation directory (CMAKE_INSTALL_PREFIX)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e86e505..4395f5d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,27 +134,27 @@ add_feature_info(corewlan WITH_COREWLAN "an closed source something")
 
 include(mkspecs/mkspecs.cmake)
 
-katie_generate_string("${CMAKE_INSTALL_PATH}" "CMAKE_INSTALL_PATH_STR" "CMAKE_INSTALL_PATH_INST")
-katie_generate_string("${LDCONF_INSTALL_PATH}" "LDCONF_INSTALL_PATH_STR" "LDCONF_INSTALL_PATH_INST")
-katie_generate_string("${PROFILE_INSTALL_PATH}" "PROFILE_INSTALL_PATH_STR" "PROFILE_INSTALL_PATH_INST")
-katie_generate_string("${MAN_INSTALL_PATH}" "MAN_INSTALL_PATH_STR" "MAN_INSTALL_PATH_INST")
-katie_generate_string("${APPLICATIONS_INSTALL_PATH}" "APPLICATIONS_INSTALL_PATH_STR" "APPLICATIONS_INSTALL_PATH_INST")
-katie_generate_string("${PIXMAPS_INSTALL_PATH}" "PIXMAPS_INSTALL_PATH_STR" "PIXMAPS_INSTALL_PATH_INST")
-
-katie_generate_string("qt_lcnsuser=${QT_LICENSE}" "QT_LICENSE_STR" "")
+katie_generate_string("${CMAKE_INSTALL_PATH}" "CMAKE_INSTALL_PATH_STR")
+katie_generate_string("${LDCONF_INSTALL_PATH}" "LDCONF_INSTALL_PATH_STR")
+katie_generate_string("${PROFILE_INSTALL_PATH}" "PROFILE_INSTALL_PATH_STR")
+katie_generate_string("${MAN_INSTALL_PATH}" "MAN_INSTALL_PATH_STR")
+katie_generate_string("${APPLICATIONS_INSTALL_PATH}" "APPLICATIONS_INSTALL_PATH_STR")
+katie_generate_string("${PIXMAPS_INSTALL_PATH}" "PIXMAPS_INSTALL_PATH_STR")
+
+katie_generate_string("qt_lcnsuser=${QT_LICENSE}" "QT_LICENSE_STR")
 katie_generate_string("qt_lcnsprod=${QT_PRODUCT}" "QT_PRODUCT_STR" "")
-katie_generate_string("qt_prfxpath=${QT_PREFIX_PATH}" "QT_PREFIX_PATH_STR" "")
-katie_generate_string("qt_hdrspath=${QT_HEADERS_PATH}" "QT_HEADERS_PATH_STR" "QT_HEADERS_PATH_INST")
-katie_generate_string("qt_libspath=${QT_LIBRARIES_PATH}" "QT_LIBRARIES_PATH_STR" "QT_LIBRARIES_PATH_INST")
-katie_generate_string("qt_binspath=${QT_BINARIES_PATH}" "QT_BINARIES_PATH_STR" "QT_BINARIES_PATH_INST")
-katie_generate_string("qt_plugpath=${QT_PLUGINS_PATH}" "QT_PLUGINS_PATH_STR" "QT_PLUGINS_PATH_INST")
-katie_generate_string("qt_impspath=${QT_IMPORTS_PATH}" "QT_IMPORTS_PATH_STR" "QT_IMPORTS_PATH_INST")
-katie_generate_string("qt_datapath=${QT_DATA_PATH}" "QT_DATA_PATH_STR" "QT_DATA_PATH_INST")
-katie_generate_string("qt_trnspath=${QT_TRANSLATIONS_PATH}" "QT_TRANSLATIONS_PATH_STR" "QT_TRANSLATIONS_PATH_INST")
-katie_generate_string("qt_stngpath=${QT_SETTINGS_PATH}" "QT_SETTINGS_PATH_STR" "QT_SETTINGS_PATH_INST")
-katie_generate_string("qt_docspath=${QT_DOCUMENTATION_PATH}" "QT_DOCUMENTATION_PATH_STR" "QT_DOCUMENTATION_PATH_INST")
-katie_generate_string("${QT_EXAMPLES_PATH}" "QT_EXAMPLES_PATH_STR" "QT_EXAMPLES_PATH_INST")
-katie_generate_string("${QT_DEMOS_PATH}" "QT_DEMOS_PATH_STR" "QT_DEMOS_PATH_INST")
+katie_generate_string("qt_prfxpath=${QT_PREFIX_PATH}" "QT_PREFIX_PATH_STR")
+katie_generate_string("qt_hdrspath=${QT_HEADERS_PATH}" "QT_HEADERS_PATH_STR")
+katie_generate_string("qt_libspath=${QT_LIBRARIES_PATH}" "QT_LIBRARIES_PATH_STR")
+katie_generate_string("qt_binspath=${QT_BINARIES_PATH}" "QT_BINARIES_PATH_STR")
+katie_generate_string("qt_plugpath=${QT_PLUGINS_PATH}" "QT_PLUGINS_PATH_STR")
+katie_generate_string("qt_impspath=${QT_IMPORTS_PATH}" "QT_IMPORTS_PATH_STR")
+katie_generate_string("qt_datapath=${QT_DATA_PATH}" "QT_DATA_PATH_STR")
+katie_generate_string("qt_trnspath=${QT_TRANSLATIONS_PATH}" "QT_TRANSLATIONS_PATH_STR")
+katie_generate_string("qt_stngpath=${QT_SETTINGS_PATH}" "QT_SETTINGS_PATH_STR")
+katie_generate_string("qt_docspath=${QT_DOCUMENTATION_PATH}" "QT_DOCUMENTATION_PATH_STR")
+katie_generate_string("${QT_EXAMPLES_PATH}" "QT_EXAMPLES_PATH_STR")
+katie_generate_string("${QT_DEMOS_PATH}" "QT_DEMOS_PATH_STR")
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ toolkit derived from the Qt 4.8 framework")
 set(CPACK_PACKAGE_VENDOR "Katie")
@@ -166,6 +166,7 @@ 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)
 if(WIN32 AND CMAKE_CROSSCOMPILING)
     # Windows build on non-Windows host, NSIS is not manditory on such
     set(CPACK_GENERATOR "ZIP")
@@ -671,7 +672,7 @@ configure_file(
 
 install(
     DIRECTORY mkspecs
-    DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie
+    DESTINATION ${CMAKE_INSTALL_PATH}
     COMPONENT Devel
 )
 
@@ -680,21 +681,21 @@ install(
     ${CMAKE_BINARY_DIR}/KatieConfig.cmake
     ${CMAKE_BINARY_DIR}/KatieConfigVersion.cmake
     ${CMAKE_SOURCE_DIR}/cmake/modules/KatieMacros.cmake
-    DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie
+    DESTINATION ${CMAKE_INSTALL_PATH}
     COMPONENT Devel
 )
 
 install(
     EXPORT KatieLibraryTargets
     NAMESPACE Katie::
-    DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie
+    DESTINATION ${CMAKE_INSTALL_PATH}
     FILE KatieLibraryTargets.cmake
 )
 
 install(
     EXPORT KatieBinaryTargets
     NAMESPACE Katie::
-    DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie
+    DESTINATION ${CMAKE_INSTALL_PATH}
     FILE KatieBinaryTargets.cmake
 )
 
@@ -706,7 +707,7 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     )
     install(
         FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
-        DESTINATION ${LDCONF_INSTALL_PATH_INST}
+        DESTINATION ${LDCONF_INSTALL_PATH}
     )
 
     configure_file(
@@ -716,7 +717,7 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     )
     install(
         FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
-        DESTINATION ${PROFILE_INSTALL_PATH_INST}
+        DESTINATION ${PROFILE_INSTALL_PATH}
     )
 endif()
 

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index 014576a..d17e77d 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -93,23 +93,17 @@ macro(KATIE_GENERATE_PACKAGE FORTARGET REQUIRES)
         )
         install(
             FILES ${CMAKE_BINARY_DIR}/pkgconfig/${FORTARGET}.pc
-            DESTINATION ${QT_LIBRARIES_PATH_INST}/pkgconfig
+            DESTINATION ${QT_LIBRARIES_PATH}/pkgconfig
         )
     endif()
 endmacro()
 
-function(KATIE_GENERATE_STRING INSTR OUTSTR OUTSTR2)
+function(KATIE_GENERATE_STRING INSTR OUTSTR)
     if("${INSTR}" GREATER "536")
         message(FATAL_ERROR "${OUTSTR} is greater than 536")
     endif()
     # qt used to do some magic, adding trailing \0 in a weird way via padstring script
     set(${OUTSTR} "${INSTR}\\0" PARENT_SCOPE)
-
-    if(OUTSTR2)
-        string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" instpath ${INSTR})
-        string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" instpath ${instpath})
-        set(${OUTSTR2} "${instpath}" PARENT_SCOPE)
-    endif()
 endfunction()
 
 # the purpose of this function is to ensure that (1) the output string is not

diff --git a/cmake/modules/KatieMacros.cmake b/cmake/modules/KatieMacros.cmake
index f83e2a1..3bb4a2b 100644 (file)
--- a/cmake/modules/KatieMacros.cmake
+++ b/cmake/modules/KatieMacros.cmake
@@ -83,7 +83,7 @@ macro(KATIE_DBUS_INTERFACE SRCIN)
 endmacro()
 
 macro(KATIE_TRANSLATIONS TRANSLATIONS)
-    if(NOT QT_TRANSLATIONS_PATH_INST)
+    if(NOT QT_TRANSLATIONS_PATH)
         message(SEND_ERROR "Directory where the translation should be installed is not set")
     endif()
     foreach(translation ${TRANSLATIONS} ${ARGN})
@@ -97,7 +97,7 @@ macro(KATIE_TRANSLATIONS TRANSLATIONS)
             COMMAND "${KATIE_LRELEASE}" "${translation}" -qm "${trout}"
         )
         file(WRITE ${trout} "This file exists only to keep the CMake logic straight")
-        install(FILES ${trout} DESTINATION ${QT_TRANSLATIONS_PATH_INST})
+        install(FILES ${trout} DESTINATION ${QT_TRANSLATIONS_PATH})
     endforeach()
 endmacro()
 

diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index 2dfd9b9..f5f25ed 100644 (file)
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -111,7 +111,7 @@ if(EXISTS ${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/${KATIE_PLATFORM}.cmake)
 endif()
 
 # misc paths, relevant mostly for UNIX-like platforms
-set(CMAKE_INSTALL_PATH "${QT_DATA_PATH}/cmake" CACHE PATH "CMake aware modules path")
+set(CMAKE_INSTALL_PATH "${QT_DATA_PATH}/cmake/Katie" CACHE PATH "CMake aware modules path")
 set(LDCONF_INSTALL_PATH "${QT_DATA_PATH}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs path (UNIX)")
 set(PROFILE_INSTALL_PATH "${QT_DATA_PATH}/profile.d" CACHE PATH "Shell profile scripts path (UNIX)")
 set(MAN_INSTALL_PATH "${QT_DATA_PATH}/man" CACHE PATH "Manual pages path (UNIX)")

diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake
index c77d5a1..c43230f 100644 (file)
--- a/mkspecs/win32/win32.cmake
+++ b/mkspecs/win32/win32.cmake
@@ -21,6 +21,8 @@ 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 691a360..d1a2cb4 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -378,12 +378,12 @@ katie_generate_package(KtCore "")
 install(
     TARGETS KtCore
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtCore
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 3e2775e..2f1059c 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -140,12 +140,12 @@ katie_generate_package(KtDBus "KtCore KtXml")
 install(
     TARGETS KtDBus
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDBus
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index 7eab9f0..9519481 100644 (file)
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -91,12 +91,12 @@ katie_generate_package(KtDeclarative "KtCore KtGui KtNetwork KtScript KtXmlPatte
 install(
     TARGETS KtDeclarative
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDeclarative
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
index db95890..18ed713 100644 (file)
--- a/src/designer/CMakeLists.txt
+++ b/src/designer/CMakeLists.txt
@@ -137,12 +137,12 @@ katie_generate_package(KtDesigner "KtCore KtGui KtXml KtUiTools")
 install(
     TARGETS KtDesigner
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDesigner
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt
index 7cde0f3..df89a9a 100644 (file)
--- a/src/designer/components/CMakeLists.txt
+++ b/src/designer/components/CMakeLists.txt
@@ -105,11 +105,11 @@ katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScr
 install(
     TARGETS KtDesignerComponents
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDesignerComponents
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9ca2759..6153ee7 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -501,12 +501,12 @@ katie_generate_package(KtGui "KtCore")
 install(
     TARGETS KtGui
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtGui
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/help/CMakeLists.txt b/src/help/CMakeLists.txt
index 822637b..725a4a3 100644 (file)
--- a/src/help/CMakeLists.txt
+++ b/src/help/CMakeLists.txt
@@ -106,12 +106,12 @@ katie_generate_package(KtHelp "KtCore KtGui KtNetwork KtSql KtXml")
 install(
     TARGETS KtHelp
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtHelp
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/imports/folderlistmodel/folderlistmodel.cmake b/src/imports/folderlistmodel/folderlistmodel.cmake
index adcfe90..a001650 100644 (file)
--- a/src/imports/folderlistmodel/folderlistmodel.cmake
+++ b/src/imports/folderlistmodel/folderlistmodel.cmake
@@ -19,9 +19,9 @@ target_link_libraries(qmlfolderlistmodelplugin ${EXTRA_FOLDERLISTMODEL_LIBS})
 
 install(
     TARGETS qmlfolderlistmodelplugin
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/folderlistmodel
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/folderlistmodel
 )
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qmldir
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/folderlistmodel
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/folderlistmodel
 )

diff --git a/src/imports/gestures/gestures.cmake b/src/imports/gestures/gestures.cmake
index 524ced0..8cd9f42 100644 (file)
--- a/src/imports/gestures/gestures.cmake
+++ b/src/imports/gestures/gestures.cmake
@@ -19,9 +19,9 @@ target_link_libraries(qmlgesturesplugin ${EXTRA_GESTURES_LIBS})
 
 install(
     TARGETS qmlgesturesplugin
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/gestures
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/gestures
 )
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qmldir
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/gestures
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/gestures
 )

diff --git a/src/imports/particles/particles.cmake b/src/imports/particles/particles.cmake
index a492413..780add5 100644 (file)
--- a/src/imports/particles/particles.cmake
+++ b/src/imports/particles/particles.cmake
@@ -19,9 +19,9 @@ target_link_libraries(qmlparticlesplugin ${EXTRA_PARTICLES_LIBS})
 
 install(
     TARGETS qmlparticlesplugin
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/particles
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/particles
 )
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/particles/qmldir
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/particles
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/particles
 )

diff --git a/src/imports/shaders/shaders.cmake b/src/imports/shaders/shaders.cmake
index 0c1c11b..f45c13e 100644 (file)
--- a/src/imports/shaders/shaders.cmake
+++ b/src/imports/shaders/shaders.cmake
@@ -30,9 +30,9 @@ target_link_libraries(qmlshadersplugin ${EXTRA_SHADERS_LIBS})
 
 install(
     TARGETS qmlshadersplugin
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/shaders
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/shaders
 )
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/shaders/qmldir
-    DESTINATION ${QT_IMPORTS_PATH_INST}/Qt/labs/shaders
+    DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/shaders
 )

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index fd8853c..37659b7 100644 (file)
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -57,12 +57,12 @@ katie_generate_package(KtMultimedia "KtCore KtGui")
 install(
     TARGETS KtMultimedia
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtMultimedia
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index c33f992..97f967f 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -100,12 +100,12 @@ katie_generate_package(KtNetwork "KtCore")
 install(
     TARGETS KtNetwork
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtNetwork
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index b4fc4d8..431c6cf 100644 (file)
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -212,12 +212,12 @@ katie_generate_package(KtOpenGL "KtCore KtGui")
 install(
     TARGETS KtOpenGL
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtOpenGL
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/plugins/accessible/widgets/widgets.cmake b/src/plugins/accessible/widgets/widgets.cmake
index b5cf300..26f7cf0 100644 (file)
--- a/src/plugins/accessible/widgets/widgets.cmake
+++ b/src/plugins/accessible/widgets/widgets.cmake
@@ -24,4 +24,7 @@ target_link_libraries(qtaccessiblewidgetsplugin KtCore KtGui)
 set_target_properties(qtaccessiblewidgetsplugin PROPERTIES OUTPUT_NAME qtaccessiblewidgets)
 target_include_directories(qtaccessiblewidgetsplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/accessible/widgets)
 
-install(TARGETS qtaccessiblewidgetsplugin DESTINATION ${QT_PLUGINS_PATH_INST}/accessible/)
+install(
+    TARGETS qtaccessiblewidgetsplugin
+    DESTINATION ${QT_PLUGINS_PATH}/accessible
+)

diff --git a/src/plugins/bearer/blackberry/blackberry.cmake b/src/plugins/bearer/blackberry/blackberry.cmake
index 48aa25f..11893ad 100644 (file)
--- a/src/plugins/bearer/blackberry/blackberry.cmake
+++ b/src/plugins/bearer/blackberry/blackberry.cmake
@@ -21,4 +21,7 @@ katie_resources("${QBBBEARERPLUGIN_SOURCES}")
 add_library(qbbbearerplugin ${KATIE_TYPE} ${QBBBEARERPLUGIN_SOURCES} ${QBBBEARER_HEADERS})
 set_target_properties(qbbbearerplugin PROPERTIES OUTPUT_NAME qbbbearer)
 
-install(TARGETS qbbbearerplugin DESTINATION ${QT_PLUGINS_PATH_INST}/bearer/)
+install(
+    TARGETS qbbbearerplugin
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
+)

diff --git a/src/plugins/bearer/connman/connman.cmake b/src/plugins/bearer/connman/connman.cmake
index 13d39e5..e1526e1 100644 (file)
--- a/src/plugins/bearer/connman/connman.cmake
+++ b/src/plugins/bearer/connman/connman.cmake
@@ -30,5 +30,5 @@ target_include_directories(qconnmanbearerplugin PRIVATE ${CMAKE_CURRENT_SOURCE_D
 
 install(
     TARGETS qconnmanbearerplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/bearer
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
 )

diff --git a/src/plugins/bearer/corewlan/corewlan.cmake b/src/plugins/bearer/corewlan/corewlan.cmake
index 3d9a8ba..4d7af96 100644 (file)
--- a/src/plugins/bearer/corewlan/corewlan.cmake
+++ b/src/plugins/bearer/corewlan/corewlan.cmake
@@ -19,4 +19,7 @@ add_library(qcorewlanbearerplugin ${KATIE_TYPE} ${QCOREWLANBEARERPLUGIN_SOURCES}
 set_target_properties(qcorewlanbearerplugin PROPERTIES OUTPUT_NAME qcorewlanbearer)
 set_target_properties(qcorewlanbearerplugin PROPERTIES LINK_FLAGS "-framework Foundation -framework SystemConfiguration -framework CoreWLAN -framework Security")
 
-install(TARGETS qcorewlanbearerplugin DESTINATION ${QT_PLUGINS_PATH_INST}/bearer/)
+install(
+    TARGETS qcorewlanbearerplugin
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
+)

diff --git a/src/plugins/bearer/generic/generic.cmake b/src/plugins/bearer/generic/generic.cmake
index c9542ce..86c69e2 100644 (file)
--- a/src/plugins/bearer/generic/generic.cmake
+++ b/src/plugins/bearer/generic/generic.cmake
@@ -27,5 +27,5 @@ set_target_properties(qgenericbearerplugin PROPERTIES OUTPUT_NAME qgenericbearer
 
 install(
     TARGETS qgenericbearerplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/bearer
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
 )

diff --git a/src/plugins/bearer/nativewifi/nativewifi.cmake b/src/plugins/bearer/nativewifi/nativewifi.cmake
index 15c2038..df4a1f6 100644 (file)
--- a/src/plugins/bearer/nativewifi/nativewifi.cmake
+++ b/src/plugins/bearer/nativewifi/nativewifi.cmake
@@ -27,5 +27,5 @@ set_target_properties(qnativewifibearerplugin PROPERTIES OUTPUT_NAME qnativewifi
 
 install(
     TARGETS qnativewifibearerplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/bearer
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
 )

diff --git a/src/plugins/bearer/networkmanager/networkmanager.cmake b/src/plugins/bearer/networkmanager/networkmanager.cmake
index a8981b9..117f1ac 100644 (file)
--- a/src/plugins/bearer/networkmanager/networkmanager.cmake
+++ b/src/plugins/bearer/networkmanager/networkmanager.cmake
@@ -29,5 +29,5 @@ set_target_properties(qnmbearerplugin PROPERTIES OUTPUT_NAME qnmbearer)
 
 install(
     TARGETS qnmbearerplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/bearer
+    DESTINATION ${QT_PLUGINS_PATH}/bearer
 )

diff --git a/src/plugins/codecs/cn/cn.cmake b/src/plugins/codecs/cn/cn.cmake
index 3746d26..060d8cf 100644 (file)
--- a/src/plugins/codecs/cn/cn.cmake
+++ b/src/plugins/codecs/cn/cn.cmake
@@ -12,4 +12,7 @@ add_library(qcncodecsplugin ${KATIE_TYPE} ${CNCODECSPLUGIN_SOURCES} ${CNCODECSPL
 target_link_libraries(qcncodecsplugin KtCore)
 set_target_properties(qcncodecsplugin PROPERTIES OUTPUT_NAME qcncodecs)
 
-install(TARGETS qcncodecsplugin DESTINATION ${QT_PLUGINS_PATH_INST}/codecs/)
+install(
+    TARGETS qcncodecsplugin
+    DESTINATION ${QT_PLUGINS_PATH}/codecs
+)

diff --git a/src/plugins/codecs/jp/jp.cmake b/src/plugins/codecs/jp/jp.cmake
index ce1bb82..24afbac 100644 (file)
--- a/src/plugins/codecs/jp/jp.cmake
+++ b/src/plugins/codecs/jp/jp.cmake
@@ -23,5 +23,5 @@ set_target_properties(qjpcodecsplugin PROPERTIES OUTPUT_NAME qjpcodecs)
 
 install(
     TARGETS qjpcodecsplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/codecs
+    DESTINATION ${QT_PLUGINS_PATH}/codecs
 )

diff --git a/src/plugins/codecs/kr/kr.cmake b/src/plugins/codecs/kr/kr.cmake
index 64a8226..9dceb67 100644 (file)
--- a/src/plugins/codecs/kr/kr.cmake
+++ b/src/plugins/codecs/kr/kr.cmake
@@ -16,5 +16,5 @@ set_target_properties(qkrcodecsplugin PROPERTIES OUTPUT_NAME qkrcodecs)
 
 install(
     TARGETS qkrcodecsplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/codecs
+    DESTINATION ${QT_PLUGINS_PATH}/codecs
 )

diff --git a/src/plugins/codecs/tw/tw.cmake b/src/plugins/codecs/tw/tw.cmake
index 3e5b12d..e0058c5 100644 (file)
--- a/src/plugins/codecs/tw/tw.cmake
+++ b/src/plugins/codecs/tw/tw.cmake
@@ -15,5 +15,5 @@ set_target_properties(qtwcodecsplugin PROPERTIES OUTPUT_NAME qtwcodecs)
 
 install(
     TARGETS qtwcodecsplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/codecs
+    DESTINATION ${QT_PLUGINS_PATH}/codecs
 )

diff --git a/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake b/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake
index c4509ae..0b52283 100644 (file)
--- a/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake
+++ b/src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake
@@ -20,5 +20,5 @@ target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRAR
 
 install(
     TARGETS qdeclarativeviewplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/designer
+    DESTINATION ${QT_PLUGINS_PATH}/designer
 )

diff --git a/src/plugins/graphicssystems/meego/meego.cmake b/src/plugins/graphicssystems/meego/meego.cmake
index 143b2cc..31a83d4 100644 (file)
--- a/src/plugins/graphicssystems/meego/meego.cmake
+++ b/src/plugins/graphicssystems/meego/meego.cmake
@@ -30,4 +30,7 @@ katie_resources("${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES}")
 add_library(qmeegographicssystemplugin ${KATIE_TYPE} ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES} ${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS})
 set_target_properties(qmeegographicssystemplugin PROPERTIES OUTPUT_NAME qmeegographicssystem)
 
-install(TARGETS qmeegographicssystemplugin DESTINATION ${QT_PLUGINS_PATH_INST}/graphicssystems/)
+install(
+    TARGETS qmeegographicssystemplugin
+    DESTINATION ${QT_PLUGINS_PATH}/graphicssystems
+)

diff --git a/src/plugins/graphicssystems/opengl/opengl.cmake b/src/plugins/graphicssystems/opengl/opengl.cmake
index 338a786..22b6e3e 100644 (file)
--- a/src/plugins/graphicssystems/opengl/opengl.cmake
+++ b/src/plugins/graphicssystems/opengl/opengl.cmake
@@ -13,5 +13,5 @@ set_target_properties(qglgraphicssystemplugin PROPERTIES OUTPUT_NAME qglgraphics
 
 install(
     TARGETS qglgraphicssystemplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/graphicssystems
+    DESTINATION ${QT_PLUGINS_PATH}/graphicssystems
 )

diff --git a/src/plugins/graphicssystems/trace/trace.cmake b/src/plugins/graphicssystems/trace/trace.cmake
index eaadc4b..cf1379c 100644 (file)
--- a/src/plugins/graphicssystems/trace/trace.cmake
+++ b/src/plugins/graphicssystems/trace/trace.cmake
@@ -12,5 +12,5 @@ set_target_properties(qtracegraphicssystemplugin PROPERTIES OUTPUT_NAME qtracegr
 
 install(
     TARGETS qtracegraphicssystemplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/graphicssystems
+    DESTINATION ${QT_PLUGINS_PATH}/graphicssystems
 )

diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.cmake b/src/plugins/iconengines/svgiconengine/svgiconengine.cmake
index 9a933d2..152b564 100644 (file)
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.cmake
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.cmake
@@ -18,5 +18,5 @@ set_target_properties(qsvgiconplugin PROPERTIES OUTPUT_NAME qsvgicon)
 
 install(
     TARGETS qsvgiconplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/iconengines
+    DESTINATION ${QT_PLUGINS_PATH}/iconengines
 )

diff --git a/src/plugins/imageformats/gif/gif.cmake b/src/plugins/imageformats/gif/gif.cmake
index 6ecb9e7..5d1187b 100644 (file)
--- a/src/plugins/imageformats/gif/gif.cmake
+++ b/src/plugins/imageformats/gif/gif.cmake
@@ -10,5 +10,5 @@ set_target_properties(qgifplugin PROPERTIES OUTPUT_NAME qgif)
 
 install(
     TARGETS qgifplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/ico/ico.cmake b/src/plugins/imageformats/ico/ico.cmake
index 8f00bc6..a41f3af 100644 (file)
--- a/src/plugins/imageformats/ico/ico.cmake
+++ b/src/plugins/imageformats/ico/ico.cmake
@@ -15,5 +15,5 @@ set_target_properties(qicoplugin PROPERTIES OUTPUT_NAME qico)
 
 install(
     TARGETS qicoplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/jpeg/jpeg.cmake b/src/plugins/imageformats/jpeg/jpeg.cmake
index 4c4cb96..a4e6b7e 100644 (file)
--- a/src/plugins/imageformats/jpeg/jpeg.cmake
+++ b/src/plugins/imageformats/jpeg/jpeg.cmake
@@ -10,5 +10,5 @@ set_target_properties(qjpegplugin PROPERTIES OUTPUT_NAME qjpeg)
 
 install(
     TARGETS qjpegplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/mng/mng.cmake b/src/plugins/imageformats/mng/mng.cmake
index 010e032..825456d 100644 (file)
--- a/src/plugins/imageformats/mng/mng.cmake
+++ b/src/plugins/imageformats/mng/mng.cmake
@@ -10,5 +10,5 @@ set_target_properties(qmngplugin PROPERTIES OUTPUT_NAME qmng)
 
 install(
     TARGETS qmngplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/svg/svg.cmake b/src/plugins/imageformats/svg/svg.cmake
index 9874be5..960d757 100644 (file)
--- a/src/plugins/imageformats/svg/svg.cmake
+++ b/src/plugins/imageformats/svg/svg.cmake
@@ -15,5 +15,5 @@ set_target_properties(qsvgplugin PROPERTIES OUTPUT_NAME qsvg)
 
 install(
     TARGETS qsvgplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/tga/tga.cmake b/src/plugins/imageformats/tga/tga.cmake
index 3b36dd1..727d5bb 100644 (file)
--- a/src/plugins/imageformats/tga/tga.cmake
+++ b/src/plugins/imageformats/tga/tga.cmake
@@ -17,5 +17,5 @@ set_target_properties(qtgaplugin PROPERTIES OUTPUT_NAME qtga)
 
 install(
     TARGETS qtgaplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/imageformats/tiff/tiff.cmake b/src/plugins/imageformats/tiff/tiff.cmake
index 5bc96e0..da68881 100644 (file)
--- a/src/plugins/imageformats/tiff/tiff.cmake
+++ b/src/plugins/imageformats/tiff/tiff.cmake
@@ -10,5 +10,5 @@ set_target_properties(qtiffplugin PROPERTIES OUTPUT_NAME qtiff)
 
 install(
     TARGETS qtiffplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/imageformats
+    DESTINATION ${QT_PLUGINS_PATH}/imageformats
 )

diff --git a/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake b/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake
index 0c69942..deeb51c 100644 (file)
--- a/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake
+++ b/src/plugins/inputmethods/imsw-multi/imsw-multi.cmake
@@ -23,5 +23,5 @@ set_target_properties(qimsw-multiplugin PROPERTIES OUTPUT_NAME qimsw-multi)
 
 install(
     TARGETS qimsw-multiplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/inputmethods
+    DESTINATION ${QT_PLUGINS_PATH}/inputmethods
 )

diff --git a/src/plugins/platforms/blackberry/blackberry.cmake b/src/plugins/platforms/blackberry/blackberry.cmake
index 711a367..cc83951 100644 (file)
--- a/src/plugins/platforms/blackberry/blackberry.cmake
+++ b/src/plugins/platforms/blackberry/blackberry.cmake
@@ -81,4 +81,7 @@ target_link_libraries(blackberryplugin pps screen clipboard ${EGL_LIBRARIES})
 target_compile_definitions(blackberryplugin ${BLACKBERRYPLUGIN_DEFINITIONS})
 target_include_directories(blackberryplugin PRIVATE ${BLACKBERRYPLUGIN_INCLUDES})
 
-install(TARGETS blackberryplugin DESTINATION ${QT_PLUGINS_PATH_INST}/platforms/)
+install(
+    TARGETS blackberryplugin
+    DESTINATION ${QT_PLUGINS_PATH}/platforms
+)

diff --git a/src/plugins/platforms/wayland/wayland.cmake b/src/plugins/platforms/wayland/wayland.cmake
index ebe2d06..56ce597 100644 (file)
--- a/src/plugins/platforms/wayland/wayland.cmake
+++ b/src/plugins/platforms/wayland/wayland.cmake
@@ -50,4 +50,7 @@ set_target_properties(qwaylandplugin PROPERTIES OUTPUT_NAME qwayland)
 target_compile_definitions(qwaylandplugin ${WAYLANDPLUGIN_DEFINITIONS})
 target_include_directories(qwaylandplugin ${WAYLANDPLUGIN_INCLUDES})
 
-install(TARGETS qwaylandplugin DESTINATION ${QT_PLUGINS_PATH_INST}/platforms/)
+install(
+    TARGETS qwaylandplugin
+    DESTINATION ${QT_PLUGINS_PATH}/platforms
+)

diff --git a/src/plugins/platforms/xlib/xlib.cmake b/src/plugins/platforms/xlib/xlib.cmake
index 0a29b74..6b25339 100644 (file)
--- a/src/plugins/platforms/xlib/xlib.cmake
+++ b/src/plugins/platforms/xlib/xlib.cmake
@@ -94,4 +94,7 @@ set_target_properties(qxlibplugin PROPERTIES OUTPUT_NAME qxlib)
 target_link_libraries(qxlibplugin ${EXTRA_QXLIB_LIBS})
 target_include_directories(qxlibplugin PRIVATE ${QXLIBPLUGIN_INCLUDES})
 
-install(TARGETS qxlibplugin DESTINATION ${QT_PLUGINS_PATH_INST}/platforms/)
+install(
+    TARGETS qxlibplugin
+    DESTINATION ${QT_PLUGINS_PATH}/platforms
+)

diff --git a/src/plugins/script/qtdbus/qtdbus.cmake b/src/plugins/script/qtdbus/qtdbus.cmake
index f4515fc..2c12eef 100644 (file)
--- a/src/plugins/script/qtdbus/qtdbus.cmake
+++ b/src/plugins/script/qtdbus/qtdbus.cmake
@@ -21,5 +21,5 @@ target_include_directories(qtscriptdbusplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR
 
 install(
     TARGETS qtscriptdbusplugin
-    DESTINATION ${QT_PLUGINS_PATH_INST}/script
+    DESTINATION ${QT_PLUGINS_PATH}/script
 )

diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index 6a68c7d..da44f2e 100644 (file)
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -324,12 +324,12 @@ katie_generate_package(KtScript "KtCore")
 install(
     TARGETS KtScript
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtScript
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/scripttools/CMakeLists.txt b/src/scripttools/CMakeLists.txt
index e5aea52..7a5bd29 100644 (file)
--- a/src/scripttools/CMakeLists.txt
+++ b/src/scripttools/CMakeLists.txt
@@ -42,12 +42,12 @@ katie_generate_package(KtScriptTools "KtCore KtGui KtScript")
 install(
     TARGETS KtScriptTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtScriptTools
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index e41d717..9d9813a 100644 (file)
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -93,12 +93,12 @@ katie_generate_package(KtSql "KtCore")
 install(
     TARGETS KtSql
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtSql
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 0ee026b..aef7227 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -87,12 +87,12 @@ katie_generate_package(KtSvg "KtCore KtGui")
 install(
     TARGETS KtSvg
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtSvg
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 3399d8e..1692068 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -151,12 +151,12 @@ katie_generate_package(KtTest "KtCore")
 install(
     TARGETS KtTest
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtTest
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/tools/designer/CMakeLists.txt b/src/tools/designer/CMakeLists.txt
index c9dbc42..eff49ac 100644 (file)
--- a/src/tools/designer/CMakeLists.txt
+++ b/src/tools/designer/CMakeLists.txt
@@ -106,7 +106,7 @@ target_link_libraries(designer ${EXTRA_DESIGNERBIN_LIBS})
 
 install(
     TARGETS designer
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
@@ -118,12 +118,12 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     )
     install(
         PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
-        DESTINATION ${APPLICATIONS_INSTALL_PATH_INST}
+        DESTINATION ${APPLICATIONS_INSTALL_PATH}
         COMPONENT Devel
     )
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/designer.png
-        DESTINATION ${PIXMAPS_INSTALL_PATH_INST}
+        DESTINATION ${PIXMAPS_INSTALL_PATH}
         COMPONENT Devel
     )
 endif()

diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
index d671462..871c90c 100644 (file)
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -32,6 +32,6 @@ target_compile_definitions(idc PRIVATE ${BOOTSTRAP_DEFINITIONS})
 install(
     TARGETS idc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/tools/lconvert/CMakeLists.txt b/src/tools/lconvert/CMakeLists.txt
index 578560c..9e967bb 100644 (file)
--- a/src/tools/lconvert/CMakeLists.txt
+++ b/src/tools/lconvert/CMakeLists.txt
@@ -36,6 +36,6 @@ set_target_properties(lconvert PROPERTIES
 install(
     TARGETS lconvert
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/tools/lrelease/CMakeLists.txt b/src/tools/lrelease/CMakeLists.txt
index b75d60b..cd47f51 100644 (file)
--- a/src/tools/lrelease/CMakeLists.txt
+++ b/src/tools/lrelease/CMakeLists.txt
@@ -37,13 +37,13 @@ set_target_properties(lrelease PROPERTIES
 install(
     TARGETS lrelease
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.1
-        DESTINATION ${MAN_INSTALL_PATH_INST}/man1
+        DESTINATION ${MAN_INSTALL_PATH}/man1
     )
 endif()

diff --git a/src/tools/lupdate/CMakeLists.txt b/src/tools/lupdate/CMakeLists.txt
index 10b70ee..3cf1350 100644 (file)
--- a/src/tools/lupdate/CMakeLists.txt
+++ b/src/tools/lupdate/CMakeLists.txt
@@ -37,13 +37,13 @@ set_target_properties(lupdate PROPERTIES
 install(
     TARGETS lupdate
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.1
-        DESTINATION ${MAN_INSTALL_PATH_INST}/man1
+        DESTINATION ${MAN_INSTALL_PATH}/man1
     )
 endif()

diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 8ca9127..e478f7e 100644 (file)
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -46,13 +46,13 @@ set_target_properties(moc PROPERTIES
 install(
     TARGETS moc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
 if(NOT "${KATIE_PLATFORM}" MATCHES "(win32|wince|mac)")
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/moc.1
-        DESTINATION ${MAN_INSTALL_PATH_INST}/man1
+        DESTINATION ${MAN_INSTALL_PATH}/man1
     )
 endif()

diff --git a/src/tools/qcollectiongenerator/CMakeLists.txt b/src/tools/qcollectiongenerator/CMakeLists.txt
index 2c7059f..0682b72 100644 (file)
--- a/src/tools/qcollectiongenerator/CMakeLists.txt
+++ b/src/tools/qcollectiongenerator/CMakeLists.txt
@@ -40,6 +40,6 @@ set_target_properties(qcollectiongenerator PROPERTIES
 install(
     TARGETS qcollectiongenerator
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/tools/qdbus/CMakeLists.txt b/src/tools/qdbus/CMakeLists.txt
index 1c2540a..e249470 100644 (file)
--- a/src/tools/qdbus/CMakeLists.txt
+++ b/src/tools/qdbus/CMakeLists.txt
@@ -35,13 +35,13 @@ set_target_properties(qdbusxml2cpp PROPERTIES
 install(
     TARGETS qdbus qdbuscpp2xml qdbusxml2cpp
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1
-        DESTINATION ${MAN_INSTALL_PATH_INST}/man1
+        DESTINATION ${MAN_INSTALL_PATH}/man1
     )
 endif()

diff --git a/src/tools/qdbusviewer/CMakeLists.txt b/src/tools/qdbusviewer/CMakeLists.txt
index 5fbf984..fbbed68 100644 (file)
--- a/src/tools/qdbusviewer/CMakeLists.txt
+++ b/src/tools/qdbusviewer/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(qdbusviewer PROPERTIES
 install(
     TARGETS qdbusviewer
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )
 
@@ -61,12 +61,12 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
     )
     install(
         PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
-        DESTINATION ${APPLICATIONS_INSTALL_PATH_INST}
+        DESTINATION ${APPLICATIONS_INSTALL_PATH}
         COMPONENT Devel
     )
     install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.png
-        DESTINATION ${PIXMAPS_INSTALL_PATH_INST}
+        DESTINATION ${PIXMAPS_INSTALL_PATH}
         COMPONENT Devel
     )
 endif()

diff --git a/src/tools/qhelpgenerator/CMakeLists.txt b/src/tools/qhelpgenerator/CMakeLists.txt
index 1247f7f..e47da35 100644 (file)
--- a/src/tools/qhelpgenerator/CMakeLists.txt
+++ b/src/tools/qhelpgenerator/CMakeLists.txt
@@ -38,6 +38,6 @@ set_target_properties(qhelpgenerator PROPERTIES
 install(
     TARGETS qhelpgenerator
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index b6a8bad..4cfd9c1 100644 (file)
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -32,6 +32,6 @@ set_target_properties(rcc PROPERTIES
 install(
     TARGETS rcc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index cd5335f..0b9ba5d 100644 (file)
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -57,6 +57,6 @@ set_target_properties(uic PROPERTIES
 install(
     TARGETS uic
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
+    RUNTIME DESTINATION ${QT_BINARIES_PATH}
     COMPONENT Devel
 )

diff --git a/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt
index 31c4168..2e702a8 100644 (file)
--- a/src/uitools/CMakeLists.txt
+++ b/src/uitools/CMakeLists.txt
@@ -74,12 +74,12 @@ katie_generate_package(KtUiTools "KtCore KtGui KtXml KtScript")
 install(
     TARGETS KtUiTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtUiTools
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
index 78dcb58..ecedb38 100644 (file)
--- a/src/winmain/CMakeLists.txt
+++ b/src/winmain/CMakeLists.txt
@@ -26,5 +26,5 @@ set_target_properties(KtMain PROPERTIES
 install(
     TARGETS KtMain
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index bde2f3a..0ee0797 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -87,12 +87,12 @@ katie_generate_package(KtXml "KtCore")
 install(
     TARGETS KtXml
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtXml
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )
 

diff --git a/src/xmlpatterns/CMakeLists.txt b/src/xmlpatterns/CMakeLists.txt
index 607b058..92a20e5 100644 (file)
--- a/src/xmlpatterns/CMakeLists.txt
+++ b/src/xmlpatterns/CMakeLists.txt
@@ -91,12 +91,12 @@ katie_generate_package(KtXmlPatterns "KtCore KtNetwork")
 install(
     TARGETS KtXmlPatterns
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
-    DESTINATION ${QT_LIBRARIES_PATH_INST}
+    DESTINATION ${QT_LIBRARIES_PATH}
 )
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/include/QtXmlPatterns
-    DESTINATION ${QT_HEADERS_PATH_INST}
+    DESTINATION ${QT_HEADERS_PATH}
     COMPONENT Devel
 )