From 869037812c14cf96d49aa46d0d723eba50199367 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 5 Mar 2017 17:04:53 -0600 Subject: [PATCH] qttools: update cmake paths for Qt 5.8 --- .../qt-5/5.8/qttools/cmake-paths.patch | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch index fe5bcadbe9a..3d557c4c023 100644 --- a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch +++ b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch @@ -1,7 +1,7 @@ -Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in +Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake.in =================================================================== ---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in +--- qttools-opensource-src-5.8.0.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in ++++ qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake.in @@ -2,11 +2,10 @@ if (NOT TARGET Qt5::qcollectiongenerator) add_executable(Qt5::qcollectiongenerator IMPORTED) @@ -18,10 +18,23 @@ Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qcollectiongenerator PROPERTIES -Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in +@@ -17,11 +16,7 @@ endif() + if (NOT TARGET Qt5::qhelpgenerator) + add_executable(Qt5::qhelpgenerator IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qhelpgenerator PROPERTIES +Index: qttools-opensource-src-5.8.0/src/linguist/Qt5LinguistToolsConfig.cmake.in =================================================================== ---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in +--- qttools-opensource-src-5.8.0.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in ++++ qttools-opensource-src-5.8.0/src/linguist/Qt5LinguistToolsConfig.cmake.in @@ -44,11 +44,10 @@ endmacro() if (NOT TARGET Qt5::lrelease) add_executable(Qt5::lrelease IMPORTED)