diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5566870576..242961b717 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,15 @@ if (QT_WILL_BUILD_TOOLS) add_subdirectory(qmake) endif() +# As long as we use the mkspecs (for qplatformdefs.h), we need to always +# install it, especially when cross-compiling. +set(mkspecs_install_dir "${INSTALL_DATADIR}") +qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir}) + +qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs" + DESTINATION ${mkspecs_install_dir}) + + qt_build_repo_end() option(BUILD_EXAMPLES "Build Qt examples" ON) diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 7146776d67..438f21d767 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -1,13 +1,5 @@ # Generated from qmake.pro. -# special case begin -set(path_component "${INSTALL_DATADIR}") -qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${path_component}) - -qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs" - DESTINATION ${mkspecs_install_dir}) -# special case end - ##################################################################### ## qmake Binary: ##################################################################### |