Skip to content

Instantly share code, notes, and snippets.

@scpeters
Last active January 3, 2017 08:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save scpeters/d8ec8c1bd4c16f03084a696b47ba6383 to your computer and use it in GitHub Desktop.
Save scpeters/d8ec8c1bd4c16f03084a696b47ba6383 to your computer and use it in GitHub Desktop.
fix qt5 cmake config to use absolute install path instead of relative path so unlinked mkspec files can be found
--- a/qtbase/src/corelib/corelib.pro 2016-12-01 00:17:04.000000000 -0800
+++ b/qtbase/src/corelib/corelib.pro 2017-01-03 00:23:17.000000000 -0800
@@ -103,11 +103,8 @@
cmake_extras_mkspec_dir.input = $$PWD/Qt5CoreConfigExtrasMkspecDir.cmake.in
cmake_extras_mkspec_dir.output = $$DESTDIR/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
-CMAKE_INSTALL_DATA_DIR = $$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])
-contains(CMAKE_INSTALL_DATA_DIR, "^\\.\\./.*"):!isEmpty(CMAKE_INSTALL_DATA_DIR) {
- CMAKE_INSTALL_DATA_DIR = $$[QT_HOST_DATA]/
+ CMAKE_INSTALL_DATA_DIR = $$[QT_INSTALL_PREFIX]/
CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE = True
-}
cmake_extras_mkspec_dir_for_install.input = $$PWD/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
cmake_extras_mkspec_dir_for_install.output = $$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
--- a/qtbase/src/corelib/corelib.pro 2016-12-01 00:17:04.000000000 -0800
+++ b/qtbase/src/corelib/corelib.pro 2016-12-30 22:19:34.000000000 -0800
@@ -94,12 +94,9 @@
CMAKE_DISABLED_FEATURES = $$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n) ")
-CMAKE_HOST_DATA_DIR = $$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])
-contains(CMAKE_HOST_DATA_DIR, "^\\.\\./.*"):!isEmpty(CMAKE_HOST_DATA_DIR) {
- CMAKE_HOST_DATA_DIR = $$[QT_HOST_DATA/src]/
+ CMAKE_HOST_DATA_DIR = $$[QT_INSTALL_PREFIX]/
CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = True
-}
cmake_extras_mkspec_dir.input = $$PWD/Qt5CoreConfigExtrasMkspecDir.cmake.in
cmake_extras_mkspec_dir.output = $$DESTDIR/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment