From: Viktor Szakats Date: Tue, 17 Jun 2025 18:30:06 +0000 (+0200) Subject: cmake: drop passing redundant `CURL_STATICLIB` in examples and clients X-Git-Tag: curl-8_15_0~243 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e3492690b8d15a81f029516ae7e06a2de5863b9;p=thirdparty%2Fcurl.git cmake: drop passing redundant `CURL_STATICLIB` in examples and clients It's set implicitly via libcurl. Closes #17655 --- diff --git a/docs/examples/CMakeLists.txt b/docs/examples/CMakeLists.txt index d9fcd7df7f..a88edc8ba9 100644 --- a/docs/examples/CMakeLists.txt +++ b/docs/examples/CMakeLists.txt @@ -34,8 +34,5 @@ foreach(_target IN LISTS check_PROGRAMS) add_dependencies(curl-examples ${_target_name}) target_link_libraries(${_target_name} ${LIB_SELECTED} ${CURL_LIBS}) target_compile_definitions(${_target_name} PRIVATE "CURL_NO_OLDIES" "$<$:_CRT_SECURE_NO_DEPRECATE>") - if(LIB_SELECTED STREQUAL LIB_STATIC AND WIN32) - set_property(TARGET ${_target_name} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB") - endif() set_target_properties(${_target_name} PROPERTIES OUTPUT_NAME "${_target}" PROJECT_LABEL "Example ${_target}" UNITY_BUILD OFF) endforeach() diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 91c3c0ec7b..266f6c64d7 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -52,7 +52,4 @@ target_include_directories(clients PRIVATE target_link_libraries(clients ${LIB_SELECTED} ${CURL_LIBS}) set_property(TARGET clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "$<$:_CRT_SECURE_NO_DEPRECATE>") -if(LIB_SELECTED STREQUAL LIB_STATIC AND WIN32) - set_property(TARGET clients APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB") -endif() set_target_properties(clients PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF)