diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-06-29 07:57:12 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-29 07:57:12 +1000 |
| commit | 5810c325422055dc29219c7ec4df5551cf592c57 (patch) | |
| tree | e3048f6c042c0b85cc97ee2063faedc46dc134e2 | |
| parent | f24615b6fee521e9cfd2fab570e2f7ff4bbad3fa (diff) | |
| parent | f4fafc5bf2d2a1c5db04ed2253b392a61741bf0b (diff) | |
Merge pull request #25378 from fuzzard/cmake_minors2
[Cmake] silence policy warning and OCD reordering
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake/modules/FindCurl.cmake | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 68abd45abf..f6ba1e9097 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,13 @@ if(POLICY CMP0069) cmake_policy(SET CMP0069 NEW) endif() +# https://cmake.org/cmake/help/latest/policy/CMP0074.html +# find_package() uses <PackageName>_ROOT variables +if(POLICY CMP0074) + set(CMAKE_POLICY_DEFAULT_CMP0074 NEW) + cmake_policy(SET CMP0074 NEW) +endif() + if(POLICY CMP0079) set(CMAKE_POLICY_DEFAULT_CMP0079 NEW) cmake_policy(SET CMP0079 NEW) diff --git a/cmake/modules/FindCurl.cmake b/cmake/modules/FindCurl.cmake index 7870b11031..a26682395c 100644 --- a/cmake/modules/FindCurl.cmake +++ b/cmake/modules/FindCurl.cmake @@ -11,10 +11,9 @@ if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME}) include(cmake/scripts/common/ModuleHelpers.cmake) macro(buildCurl) - + find_package(Brotli REQUIRED QUIET) find_package(NGHttp2 REQUIRED QUIET) find_package(OpenSSL REQUIRED QUIET) - find_package(Brotli REQUIRED QUIET) # Darwin platforms link against toolchain provided zlib regardless # They will fail when searching for static. All other platforms, prefer static @@ -23,7 +22,7 @@ if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME}) if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT (WIN32 OR WINDOWS_STORE)) set(ZLIB_USE_STATIC_LIBS ON) endif() - find_package(ZLIB REQUIRED) + find_package(Zlib REQUIRED) unset(ZLIB_USE_STATIC_LIBS) set(CURL_VERSION ${${MODULE}_VER}) @@ -61,14 +60,14 @@ if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME}) BUILD_DEP_TARGET() # Link libraries for target interface - set(PC_CURL_LINK_LIBRARIES Brotli::Brotli OpenSSL::Crypto OpenSSL::SSL NGHttp2::NGHttp2 ZLIB::ZLIB ${PLATFORM_LINK_LIBS}) + set(PC_CURL_LINK_LIBRARIES Brotli::Brotli NGHttp2::NGHttp2 OpenSSL::Crypto OpenSSL::SSL ZLIB::ZLIB ${PLATFORM_LINK_LIBS}) # Add dependencies to build target + add_dependencies(${MODULE_LC} Brotli::Brotli) add_dependencies(${MODULE_LC} NGHttp2::NGHttp2) add_dependencies(${MODULE_LC} OpenSSL::SSL) add_dependencies(${MODULE_LC} OpenSSL::Crypto) add_dependencies(${MODULE_LC} ZLIB::ZLIB) - add_dependencies(${MODULE_LC} Brotli::Brotli) endmacro() set(MODULE_LC curl) |