From: Viktor Szakats Date: Tue, 8 Apr 2025 22:10:30 +0000 (+0200) Subject: cmake: quotes, whitespace, use `VERSION_GREATER_EQUAL` X-Git-Tag: curl-8_14_0~329 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6af7ab3b39194b93aa1310fe5cd189d1f375336c;p=thirdparty%2Fcurl.git cmake: quotes, whitespace, use `VERSION_GREATER_EQUAL` - `NOT` + `VERSION_LESS` -> `VERSION_GREATER_EQUAL` Available since 3.7, which is the minimum required for curl: https://cmake.org/cmake/help/latest/command/if.html#version-greater-equal - make `CMAKE_REQUIRED_*` argument quotes consistent. - make `CMAKE_REQUIRED_*` space alignment consistent. - drop quote from version value for consistency with other cases. - formatting Closes #17002 --- diff --git a/CMake/CurlSymbolHiding.cmake b/CMake/CurlSymbolHiding.cmake index 48ef193b9a..217c8832c9 100644 --- a/CMake/CurlSymbolHiding.cmake +++ b/CMake/CurlSymbolHiding.cmake @@ -43,17 +43,17 @@ if(CURL_HIDDEN_SYMBOLS) set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU") - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.4) # Note: This is considered buggy prior to 4.0 but the autotools do not care, so let us ignore that fact set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") endif() - elseif(CMAKE_C_COMPILER_ID MATCHES "SunPro" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0) + elseif(CMAKE_C_COMPILER_ID MATCHES "SunPro" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) set(CURL_EXTERN_SYMBOL "__global") set(CURL_CFLAG_SYMBOLS_HIDE "-xldscope=hidden") - elseif(CMAKE_C_COMPILER_ID MATCHES "Intel" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0) # Requires 9.1.045 + elseif(CMAKE_C_COMPILER_ID MATCHES "Intel" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0) # Requires 9.1.045 set(CURL_HIDES_PRIVATE_SYMBOLS TRUE) set(CURL_EXTERN_SYMBOL "__attribute__((__visibility__(\"default\")))") set(CURL_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") diff --git a/CMake/PickyWarnings.cmake b/CMake/PickyWarnings.cmake index 4f04ed1330..a41b71ef89 100644 --- a/CMake/PickyWarnings.cmake +++ b/CMake/PickyWarnings.cmake @@ -28,15 +28,15 @@ set(_picky "") if(CURL_WERROR AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT DOS AND # Watt-32 headers use the '#include_next' GCC extension - NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND - NOT CMAKE_VERSION VERSION_LESS 3.23.0) OR # to avoid check_symbol_exists() conflicting with GCC -pedantic-errors + CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0 AND + CMAKE_VERSION VERSION_GREATER_EQUAL 3.23.0) OR # to avoid check_symbol_exists() conflicting with GCC -pedantic-errors CMAKE_C_COMPILER_ID MATCHES "Clang")) list(APPEND _picky "-pedantic-errors") endif() if(APPLE AND - (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6) OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.3)) + (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.6) OR + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 6.3)) list(APPEND _picky "-Werror=partial-availability") # clang 3.6 appleclang 6.3 endif() @@ -141,8 +141,8 @@ if(PICKY_COMPILER) ) endif() # Enable based on compiler version - if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6) OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.3)) + if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.6) OR + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 6.3)) list(APPEND _picky_enable -Wdouble-promotion # clang 3.6 gcc 4.6 appleclang 6.3 -Wenum-conversion # clang 3.2 gcc 10.0 appleclang 4.6 g++ 11.0 @@ -153,29 +153,29 @@ if(PICKY_COMPILER) -Wunused-const-variable # clang 3.4 gcc 6.0 appleclang 5.1 ) endif() - if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9) OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.3)) + if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.9) OR + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.3)) list(APPEND _picky_enable -Wcomma # clang 3.9 appleclang 8.3 -Wmissing-variable-declarations # clang 3.2 appleclang 4.6 ) endif() - if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0) OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.3)) + if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.3)) list(APPEND _picky_enable -Wassign-enum # clang 7.0 appleclang 10.3 -Wextra-semi-stmt # clang 7.0 appleclang 10.3 ) endif() - if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0) OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.4)) + if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0) OR + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.4)) list(APPEND _picky_enable -Wimplicit-fallthrough # clang 4.0 gcc 7.0 appleclang 12.4 # We do silencing for clang 10.0 and above only ) endif() else() # gcc # Enable based on compiler version - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.3) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.3) list(APPEND _picky_enable ${_picky_common_old} -Wclobbered # gcc 4.3 @@ -186,7 +186,7 @@ if(PICKY_COMPILER) -ftree-vrp # gcc 4.3 (required for -Warray-bounds, included in -Wall) ) endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.5) list(APPEND _picky_enable -Wjump-misses-init # gcc 4.5 ) @@ -197,19 +197,19 @@ if(PICKY_COMPILER) ) endif() endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8) list(APPEND _picky_enable -Wdouble-promotion # clang 3.6 gcc 4.6 appleclang 6.3 -Wformat=2 # clang 3.0 gcc 4.8 -Wtrampolines # gcc 4.6 ) endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) list(APPEND _picky_enable -Warray-bounds=2 # clang 3.0 gcc 5.0 (clang default: -Warray-bounds) ) endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) list(APPEND _picky_enable -Wduplicated-cond # gcc 6.0 -Wnull-dereference # clang 3.0 gcc 6.0 (clang default) @@ -219,7 +219,7 @@ if(PICKY_COMPILER) -Wunused-const-variable # clang 3.4 gcc 6.0 appleclang 5.1 ) endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) list(APPEND _picky_enable -Walloc-zero # gcc 7.0 -Wduplicated-branches # gcc 7.0 @@ -228,7 +228,7 @@ if(PICKY_COMPILER) -Wrestrict # gcc 7.0 ) endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0) list(APPEND _picky_enable -Warith-conversion # gcc 10.0 -Wenum-conversion # clang 3.2 gcc 10.0 appleclang 4.6 g++ 11.0 @@ -260,17 +260,17 @@ if(PICKY_COMPILER) list(APPEND _picky "-Wno-shadow") list(APPEND _picky "-Wno-unreachable-code") endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.2 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) # GCC <4.6 do not support #pragma to suppress warnings locally. Disable them globally instead. list(APPEND _picky "-Wno-overlength-strings") endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.0 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) list(APPEND _picky "-Wno-missing-field-initializers") # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36750 endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.3 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.3 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8) list(APPEND _picky "-Wno-type-limits") # Avoid false positives endif() - if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.1 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 5.5) + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 5.1 AND CMAKE_C_COMPILER_VERSION VERSION_LESS 5.5) list(APPEND _picky "-Wno-conversion") # Avoid false positives endif() endif() diff --git a/CMake/win32-cache.cmake b/CMake/win32-cache.cmake index 5bf8f203fb..163a310fda 100644 --- a/CMake/win32-cache.cmake +++ b/CMake/win32-cache.cmake @@ -75,8 +75,8 @@ else() endif() endif() -if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) OR - (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6)) +if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.9) OR + (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.6)) # MinGW or clang-cl set(HAVE_STDATOMIC_H 1) set(HAVE_ATOMIC 1) @@ -208,11 +208,11 @@ if(MINGW OR MSVC) else() # SSIZE_T: 8 for _WIN64, 4 otherwise if(MINGW64_VERSION) - if(NOT MINGW64_VERSION VERSION_LESS 3.0) + if(MINGW64_VERSION VERSION_GREATER_EQUAL 3.0) set(HAVE_FILE_OFFSET_BITS 1) curl_prefill_type_size("OFF_T" 8) endif() - if(NOT MINGW64_VERSION VERSION_LESS 2.0) + if(MINGW64_VERSION VERSION_GREATER_EQUAL 2.0) curl_prefill_type_size("ADDRESS_FAMILY" 2) else() set(HAVE_SIZEOF_ADDRESS_FAMILY 0) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bbf7aede2..330eca6636 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -923,8 +923,8 @@ if(CURL_USE_GNUTLS) if(NOT DEFINED HAVE_GNUTLS_SRP AND NOT CURL_DISABLE_SRP) cmake_push_check_state() - list(APPEND CMAKE_REQUIRED_INCLUDES ${GNUTLS_INCLUDE_DIRS}) - list(APPEND CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIRS}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}") check_symbol_exists("gnutls_srp_verifier" "gnutls/gnutls.h" HAVE_GNUTLS_SRP) cmake_pop_check_state() endif() @@ -944,12 +944,12 @@ if(CURL_USE_RUSTLS) endif() if(NOT DEFINED HAVE_RUSTLS_SUPPORTED_HPKE) - if(RUSTLS_VERSION AND RUSTLS_VERSION VERSION_GREATER_EQUAL "0.15") + if(RUSTLS_VERSION AND RUSTLS_VERSION VERSION_GREATER_EQUAL 0.15) set(HAVE_RUSTLS_SUPPORTED_HPKE TRUE) elseif(NOT RUSTLS_VERSION) cmake_push_check_state() - list(APPEND CMAKE_REQUIRED_INCLUDES ${RUSTLS_INCLUDE_DIRS}) - list(APPEND CMAKE_REQUIRED_LIBRARIES ${RUSTLS_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_INCLUDES "${RUSTLS_INCLUDE_DIRS}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${RUSTLS_LIBRARIES}") curl_required_libpaths("${RUSTLS_LIBRARY_DIRS}") check_symbol_exists("rustls_supported_hpke" "rustls.h" HAVE_RUSTLS_SUPPORTED_HPKE) cmake_pop_check_state() @@ -999,7 +999,7 @@ endif() set(HAVE_ZSTD OFF) curl_dependency_option(CURL_ZSTD Zstd "zstd") if(ZSTD_FOUND) - if(NOT ZSTD_VERSION VERSION_LESS 1.0.0) + if(ZSTD_VERSION VERSION_GREATER_EQUAL 1.0.0) set(HAVE_ZSTD ON) list(APPEND CURL_LIBS ${ZSTD_LIBRARIES}) list(APPEND CURL_LIBDIRS ${ZSTD_LIBRARY_DIRS}) @@ -1029,8 +1029,8 @@ macro(curl_openssl_check_exists) endif() endif() if(USE_WOLFSSL) - list(APPEND CMAKE_REQUIRED_INCLUDES "${WOLFSSL_INCLUDE_DIRS}") - list(APPEND CMAKE_REQUIRED_LIBRARIES "${WOLFSSL_LIBRARIES}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${WOLFSSL_INCLUDE_DIRS}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${WOLFSSL_LIBRARIES}") curl_required_libpaths("${WOLFSSL_LIBRARY_DIRS}") if(HAVE_LIBZ) list(APPEND CMAKE_REQUIRED_LIBRARIES ZLIB::ZLIB) # Public wolfSSL headers also require zlib headers @@ -1193,8 +1193,8 @@ if(USE_QUICHE) endif() if(NOT DEFINED HAVE_QUICHE_CONN_SET_QLOG_FD) cmake_push_check_state() - list(APPEND CMAKE_REQUIRED_INCLUDES "${QUICHE_INCLUDE_DIRS}") - list(APPEND CMAKE_REQUIRED_LIBRARIES "${QUICHE_LIBRARIES}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${QUICHE_INCLUDE_DIRS}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${QUICHE_LIBRARIES}") check_symbol_exists("quiche_conn_set_qlog_fd" "quiche.h" HAVE_QUICHE_CONN_SET_QLOG_FD) cmake_pop_check_state() endif() @@ -1278,7 +1278,7 @@ if(NOT CURL_DISABLE_LDAP) # LDAP feature checks list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DLDAP_DEPRECATED=1") - list(APPEND CMAKE_REQUIRED_LIBRARIES ${LDAP_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_LIBRARIES "${LDAP_LIBRARIES}") curl_required_libpaths("${LDAP_LIBRARY_DIRS}") check_function_exists("ldap_url_parse" HAVE_LDAP_URL_PARSE) @@ -1461,7 +1461,7 @@ if(CURL_USE_GSSAPI) set(HAVE_GSSGNU 1) else() cmake_push_check_state() - list(APPEND CMAKE_REQUIRED_INCLUDES ${GSS_INCLUDE_DIRS}) + list(APPEND CMAKE_REQUIRED_INCLUDES "${GSS_INCLUDE_DIRS}") set(_include_list "") check_include_file("gssapi/gssapi.h" HAVE_GSSAPI_GSSAPI_H) @@ -1481,7 +1481,7 @@ if(CURL_USE_GSSAPI) if(NOT DEFINED HAVE_GSS_C_NT_HOSTBASED_SERVICE) string(APPEND CMAKE_REQUIRED_FLAGS " ${GSS_CFLAGS}") - list(APPEND CMAKE_REQUIRED_LIBRARIES ${GSS_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_LIBRARIES "${GSS_LIBRARIES}") curl_required_libpaths("${GSS_LIBRARY_DIRS}") check_symbol_exists("GSS_C_NT_HOSTBASED_SERVICE" "${_include_list}" HAVE_GSS_C_NT_HOSTBASED_SERVICE) endif() @@ -2199,7 +2199,7 @@ curl_add_if("PSL" USE_LIBPSL) curl_add_if("CAcert" CURL_CA_EMBED_SET) curl_add_if("SSLS-EXPORT" _ssl_enabled AND USE_SSLS_EXPORT) if(_items) - if(NOT CMAKE_VERSION VERSION_LESS 3.13) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) list(SORT _items CASE INSENSITIVE) else() list(SORT _items) @@ -2213,7 +2213,7 @@ message(STATUS "Features: ${SUPPORT_FEATURES}") set(_items "") curl_add_if("Schannel" _ssl_enabled AND USE_SCHANNEL) curl_add_if("${_openssl}" _ssl_enabled AND USE_OPENSSL AND OPENSSL_VERSION VERSION_LESS 3.0.0) -curl_add_if("${_openssl} v3+" _ssl_enabled AND USE_OPENSSL AND NOT OPENSSL_VERSION VERSION_LESS 3.0.0) +curl_add_if("${_openssl} v3+" _ssl_enabled AND USE_OPENSSL AND OPENSSL_VERSION VERSION_GREATER_EQUAL 3.0.0) curl_add_if("Secure Transport" _ssl_enabled AND USE_SECTRANSP) curl_add_if("mbedTLS" _ssl_enabled AND USE_MBEDTLS) curl_add_if("BearSSL" _ssl_enabled AND USE_BEARSSL) @@ -2222,7 +2222,7 @@ curl_add_if("GnuTLS" _ssl_enabled AND USE_GNUTLS) curl_add_if("rustls" _ssl_enabled AND USE_RUSTLS) if(_items) - if(NOT CMAKE_VERSION VERSION_LESS 3.13) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) list(SORT _items CASE INSENSITIVE) else() list(SORT _items) @@ -2300,7 +2300,7 @@ if(NOT CURL_DISABLE_INSTALL) endforeach() foreach(_libdir IN LISTS _custom_libdirs CURL_LIBDIRS) - if(NOT CMAKE_VERSION VERSION_LESS 3.20) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) cmake_path(SET _libdir NORMALIZE "${_libdir}") endif() list(FIND _sys_libdirs "${_libdir}" _libdir_index) @@ -2337,7 +2337,7 @@ if(NOT CURL_DISABLE_INSTALL) get_filename_component(_libdir ${_lib} DIRECTORY) get_filename_component(_libname ${_lib} NAME_WE) if(_libname MATCHES "^lib") - if(NOT CMAKE_VERSION VERSION_LESS 3.20) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) cmake_path(SET _libdir NORMALIZE "${_libdir}") endif() list(FIND _sys_libdirs "${_libdir}" _libdir_index) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 3e87198960..5ac343df06 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -102,7 +102,7 @@ if(NOT DEFINED SHARE_LIB_OBJECT) endif() endif() -if(SHARE_LIB_OBJECT AND NOT CMAKE_VERSION VERSION_LESS 3.12) +if(SHARE_LIB_OBJECT AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) set(LIB_OBJECT "libcurl_object") add_library(${LIB_OBJECT} OBJECT ${HHEADERS} ${CSOURCES}) # Requires CMake 3.12 if(WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3bf66091e3..e8f2815dc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,10 +90,7 @@ add_executable( ) target_compile_definitions(${EXE_NAME} PRIVATE ${_curl_definitions}) -add_executable( - ${PROJECT_NAME}::${EXE_NAME} - ALIAS ${EXE_NAME} -) +add_executable(${PROJECT_NAME}::${EXE_NAME} ALIAS ${EXE_NAME}) add_library( curltool # special libcurltool library just for unittests