diff --git a/cmake/QtCreatorTranslations.cmake b/cmake/QtCreatorTranslations.cmake index f7774194ce8..7379f1e60cc 100644 --- a/cmake/QtCreatorTranslations.cmake +++ b/cmake/QtCreatorTranslations.cmake @@ -1,7 +1,5 @@ # Defines function add_translation_targets -include(${CMAKE_CURRENT_LIST_DIR}/Utils.cmake) - function(_extract_ts_data_from_targets outprefix) set(_sources "") set(_includes "") @@ -20,7 +18,9 @@ function(_extract_ts_data_from_targets outprefix) if (NOT _skip_translation) if(_include_dirs) - remove_generator_expressions(_include_dirs ${_include_dirs}) + list(FILTER _include_dirs EXCLUDE REGEX "\\$]+)>" "\\1") list(APPEND _includes ${_include_dirs}) endif() diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index eca19a7dd0b..766b6ff755e 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -119,11 +119,3 @@ function(configure_qml_designer Qt6_VERSION) endif() endif() endfunction() - -function(remove_generator_expressions out_var list) - set(result ${list}) - list(FILTER result EXCLUDE REGEX "\\$]+)>" "\\1") - set(${out_var} ${result} PARENT_SCOPE) -endfunction() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 7d34b4365b3..9c25afb2763 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,5 @@ # Generate documentation -include(Utils) - option(BUILD_DEVELOPER_DOCS "Include developer documentation" OFF) add_feature_info("Include developer documentation" BUILD_DEVELOPER_DOCS "") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index edc23e5ed03..f537d8b9c4f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,7 +91,6 @@ file(COPY ${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.cmake ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.Info.plist.in - ${PROJECT_SOURCE_DIR}/cmake/Utils.cmake DESTINATION ${CMAKE_BINARY_DIR}/cmake ) @@ -106,7 +105,6 @@ install( ${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.cmake ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.Info.plist.in - ${PROJECT_SOURCE_DIR}/cmake/Utils.cmake ${CMAKE_BINARY_DIR}/cmake/QtCreatorConfig.cmake DESTINATION ${IDE_CMAKE_INSTALL_PATH}/QtCreator COMPONENT Devel EXCLUDE_FROM_ALL