mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 02:33:25 +00:00
fe0ab944db
The module definitions are factored out and shared between qt56 and qt59. The symlink farm which was created during builds is no longer needed.
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
|
index 5a5bd5ce..1c6727d4 100644
|
|
--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
|
+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
|
@@ -2,14 +2,13 @@
|
|
if (NOT TARGET Qt5::qcollectiongenerator)
|
|
add_executable(Qt5::qcollectiongenerator IMPORTED)
|
|
|
|
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
|
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
|
-!!ELSE
|
|
set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
|
-!!ENDIF
|
|
+ if(NOT EXISTS \"${imported_location}\")
|
|
+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
|
+ endif()
|
|
_qt5_Help_check_file_exists(${imported_location})
|
|
|
|
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
|
|
IMPORTED_LOCATION ${imported_location}
|
|
)
|
|
-endif()
|
|
+endif()
|
|
\ No newline at end of file
|
|
diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
|
index 4318b16f..d60db4ff 100644
|
|
--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
|
+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
|
@@ -44,11 +44,7 @@ endmacro()
|
|
if (NOT TARGET Qt5::lrelease)
|
|
add_executable(Qt5::lrelease IMPORTED)
|
|
|
|
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
|
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
|
-!!ELSE
|
|
set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
|
-!!ENDIF
|
|
_qt5_LinguistTools_check_file_exists(${imported_location})
|
|
|
|
set_target_properties(Qt5::lrelease PROPERTIES
|
|
@@ -59,11 +55,7 @@ endif()
|
|
if (NOT TARGET Qt5::lupdate)
|
|
add_executable(Qt5::lupdate IMPORTED)
|
|
|
|
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
|
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
|
-!!ELSE
|
|
set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
|
-!!ENDIF
|
|
_qt5_LinguistTools_check_file_exists(${imported_location})
|
|
|
|
set_target_properties(Qt5::lupdate PROPERTIES
|
|
@@ -74,11 +66,7 @@ endif()
|
|
if (NOT TARGET Qt5::lconvert)
|
|
add_executable(Qt5::lconvert IMPORTED)
|
|
|
|
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
|
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
|
-!!ELSE
|
|
set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
|
-!!ENDIF
|
|
_qt5_LinguistTools_check_file_exists(${imported_location})
|
|
|
|
set_target_properties(Qt5::lconvert PROPERTIES
|