curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-09 13:49:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: append picky warnings to CMAKE_REQUIRED_FLAGS as string

Browse Source 
Also:
- drop unnecessary type conversion. `CMAKE_REQUIRED_FLAGS` is already
  space-separated.
  https://cmake.org/cmake/help/latest/module/CheckCSourceCompiles.html

Follow-up to e86542038d #17047
Closes #17055
This commit is contained in:
Viktor Szakats 2025-04-15 00:38:49 +02:00
parent 4e203f65a1
commit 111b58fbb6
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMake/Macros.cmake
View File

@ -40,7 +40,6 @@ set(CURL_TEST_DEFINES "") # Initialize global variable
# Return result in variable: CURL_TEST_OUTPUT # Return result in variable: CURL_TEST_OUTPUT
macro(curl_internal_test _curl_test) macro(curl_internal_test _curl_test)
if(NOT DEFINED "${_curl_test}") if(NOT DEFINED "${_curl_test}")
string(REPLACE ";" " " _cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
string(REPLACE ";" " " _cmake_required_definitions "${CMAKE_REQUIRED_DEFINITIONS}") string(REPLACE ";" " " _cmake_required_definitions "${CMAKE_REQUIRED_DEFINITIONS}")
set(_curl_test_add_libraries "") set(_curl_test_add_libraries "")
if(CMAKE_REQUIRED_LIBRARIES) if(CMAKE_REQUIRED_LIBRARIES)
@ -53,7 +52,7 @@ macro(curl_internal_test _curl_test)
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c" "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c"
CMAKE_FLAGS CMAKE_FLAGS
"-DCOMPILE_DEFINITIONS:STRING=-D${_curl_test} ${CURL_TEST_DEFINES} ${_cmake_required_flags} ${_cmake_required_definitions}" "-DCOMPILE_DEFINITIONS:STRING=-D${_curl_test} ${CURL_TEST_DEFINES} ${CMAKE_REQUIRED_FLAGS} ${_cmake_required_definitions}"
"${_curl_test_add_libraries}" "${_curl_test_add_libraries}"
OUTPUT_VARIABLE CURL_TEST_OUTPUT) OUTPUT_VARIABLE CURL_TEST_OUTPUT)
if(${_curl_test}) if(${_curl_test})

2
CMake/PickyWarnings.cmake
View File

@ -298,7 +298,7 @@ if(_picky)
# Apply to all feature checks # Apply to all feature checks
list(REMOVE_ITEM _picky "-pedantic-errors") # Must not pass to feature checks list(REMOVE_ITEM _picky "-pedantic-errors") # Must not pass to feature checks
string(REPLACE ";" " " _picky_tmp "${_picky}") string(REPLACE ";" " " _picky_tmp "${_picky}")
list(APPEND CMAKE_REQUIRED_FLAGS "${_picky_tmp}") string(APPEND CMAKE_REQUIRED_FLAGS " ${_picky_tmp}")
unset(_picky) unset(_picky)
unset(_picky_tmp) unset(_picky_tmp)