mirror of
https://github.com/curl/curl.git
synced 2026-05-13 21:26:20 +03:00
cmake: initialize variables where missing
As detected using `cmake --warn-uninitialized`. It also lists: - variables inherited from `Makefile.inc`, which this PR does not fix. - a documented CMake global variable, which is unexpected: `CMAKE_MODULE_PATH`. I'd expect CMake to initialize its namespace. - envs: `CI`, `CURL_CI` and `CURL_BUILDINFO`. Unexpected, as the manual mentions variables only. As of August 2024, there is no solution to silence them: https://discourse.cmake.org/t/how-to-test-for-set-env-variables-without-getting-warnings/11401 https://cmake.org/cmake/help/latest/manual/cmake.1.html#cmdoption-cmake-warn-uninitialized Closes #16198
This commit is contained in:
parent
3c128966ed
commit
aa3e4c1db5
3 changed files with 11 additions and 0 deletions
|
|
@ -34,11 +34,14 @@ macro(check_include_file_concat_curl _file _variable)
|
|||
endif()
|
||||
endmacro()
|
||||
|
||||
set(CURL_TEST_DEFINES "") # Initialize global variable
|
||||
|
||||
# For other curl specific tests, use this macro.
|
||||
# Return result in variable: CURL_TEST_OUTPUT
|
||||
macro(curl_internal_test _curl_test)
|
||||
if(NOT DEFINED "${_curl_test}")
|
||||
string(REPLACE ";" " " _cmake_required_definitions "${CMAKE_REQUIRED_DEFINITIONS}")
|
||||
set(_curl_test_add_libraries "")
|
||||
if(CMAKE_REQUIRED_LIBRARIES)
|
||||
set(_curl_test_add_libraries
|
||||
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
|
||||
|
|
|
|||
|
|
@ -2469,6 +2469,7 @@ if(NOT CURL_DISABLE_INSTALL)
|
|||
endif()
|
||||
|
||||
# Save build info for test runner to pick up and log
|
||||
set(_cmake_sysroot "")
|
||||
if(CMAKE_OSX_SYSROOT)
|
||||
set(_cmake_sysroot ${CMAKE_OSX_SYSROOT})
|
||||
elseif(CMAKE_SYSROOT)
|
||||
|
|
|
|||
|
|
@ -65,6 +65,13 @@ endif()
|
|||
|
||||
## Library definition
|
||||
|
||||
if(NOT DEFINED IMPORT_LIB_SUFFIX)
|
||||
set(IMPORT_LIB_SUFFIX "")
|
||||
endif()
|
||||
if(NOT DEFINED STATIC_LIB_SUFFIX)
|
||||
set(STATIC_LIB_SUFFIX "")
|
||||
endif()
|
||||
|
||||
# Add "_imp" as a suffix before the extension to avoid conflicting with
|
||||
# the statically linked "libcurl.lib" (typically with MSVC)
|
||||
if(WIN32 AND
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue