feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not require CMake 3.18

Browse Source 
Amends 46f6c5d005

Simply disable this safe-guard for < 3.18.

Change-Id: I0ae3b7520a913861c8c9f97ec7e01e5c9c00d362
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2022-03-03 09:48:43 +01:00
parent b78b7d065f
commit acd7445c6e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtCreatorAPIInternal.cmake
View File

@@ -4,7 +4,10 @@ if (CMAKE_VERSION VERSION_LESS 3.18)
endif() endif()
endif() endif()
include(CheckLinkerFlag) if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
include(CheckLinkerFlag)
endif()
include(FeatureSummary) include(FeatureSummary)
# #
@@ -163,6 +166,8 @@ function(qtc_enable_sanitize _sanitize_flags)
endfunction() endfunction()
function(qtc_add_link_flags_no_undefined target) function(qtc_add_link_flags_no_undefined target)
# needs CheckLinkerFlags
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
set(no_undefined_flag "-Wl,--no-undefined") set(no_undefined_flag "-Wl,--no-undefined")
check_linker_flag(CXX ${no_undefined_flag} QTC_LINKER_SUPPORTS_NO_UNDEFINED) check_linker_flag(CXX ${no_undefined_flag} QTC_LINKER_SUPPORTS_NO_UNDEFINED)
if (NOT QTC_LINKER_SUPPORTS_NO_UNDEFINED) if (NOT QTC_LINKER_SUPPORTS_NO_UNDEFINED)
@@ -173,6 +178,7 @@ function(qtc_add_link_flags_no_undefined target)
endif() endif()
endif() endif()
target_link_options("${target}" PRIVATE "${no_undefined_flag}") target_link_options("${target}" PRIVATE "${no_undefined_flag}")
endif()
endfunction() endfunction()
function(append_extra_translations target_name) function(append_extra_translations target_name)