lol
at 18.09-beta 64 lines 2.6 kB view raw
1diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2index 5a5bd5ce..1c6727d4 100644 3--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in 4+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in 5@@ -2,14 +2,13 @@ 6 if (NOT TARGET Qt5::qcollectiongenerator) 7 add_executable(Qt5::qcollectiongenerator IMPORTED) 8 9-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 10- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") 11-!!ELSE 12 set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") 13-!!ENDIF 14+ if(NOT EXISTS \"${imported_location}\") 15+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") 16+ endif() 17 _qt5_Help_check_file_exists(${imported_location}) 18 19 set_target_properties(Qt5::qcollectiongenerator PROPERTIES 20 IMPORTED_LOCATION ${imported_location} 21 ) 22-endif() 23+endif() 24\ No newline at end of file 25diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in 26index 4318b16f..d60db4ff 100644 27--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in 28+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in 29@@ -44,11 +44,7 @@ endmacro() 30 if (NOT TARGET Qt5::lrelease) 31 add_executable(Qt5::lrelease IMPORTED) 32 33-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 34- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") 35-!!ELSE 36 set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") 37-!!ENDIF 38 _qt5_LinguistTools_check_file_exists(${imported_location}) 39 40 set_target_properties(Qt5::lrelease PROPERTIES 41@@ -59,11 +55,7 @@ endif() 42 if (NOT TARGET Qt5::lupdate) 43 add_executable(Qt5::lupdate IMPORTED) 44 45-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 46- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") 47-!!ELSE 48 set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") 49-!!ENDIF 50 _qt5_LinguistTools_check_file_exists(${imported_location}) 51 52 set_target_properties(Qt5::lupdate PROPERTIES 53@@ -74,11 +66,7 @@ endif() 54 if (NOT TARGET Qt5::lconvert) 55 add_executable(Qt5::lconvert IMPORTED) 56 57-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 58- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") 59-!!ELSE 60 set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") 61-!!ENDIF 62 _qt5_LinguistTools_check_file_exists(${imported_location}) 63 64 set_target_properties(Qt5::lconvert PROPERTIES