From 9f9afc0e8605b8db03136a6b53905b35be711119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Wed, 22 Sep 2021 14:48:06 +0100 Subject: [PATCH] CMake: Remove an unnecessary version check MINGW implies WIN32 which implies CMake >= 3.13. Follow-up to 1dad8190b1ec4ab730de428437f2f6bbbf7ce345. --- CMakeLists.txt | 2 +- extcap/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 841b3ed70b..c23b3037dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2587,7 +2587,7 @@ endmacro() macro(executable_link_mingw_unicode _target) # target_link_options() requires CMake >= 3.13 - if (MINGW AND CMAKE_VERSION VERSION_GREATER "3.12.99") + if (MINGW) target_link_options(${_target} PRIVATE "-municode") endif() endmacro() diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index faead7973c..bfac5c28ac 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -74,9 +74,10 @@ macro(set_extcap_executable_properties _executable) endif() endif() - if (MINGW AND CMAKE_VERSION VERSION_GREATER "3.12.99") + if (MINGW) set_target_properties(${_executable} PROPERTIES - LINK_OPTIONS -municode) + LINK_OPTIONS -municode + ) endif() endmacro()