e17aa98bfe
Viktor Szakats
2025-09-29
Subject
cmake: use more `COMPILER_OPTIONS`, `LINK_OPTIONS` / `LINK_FLAGS`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/CMakeLists.txt+7 -7
| @@ -112,7 +112,7 @@ if(SHARE_LIB_OBJECT AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) | |
| set_target_properties(${LIB_OBJECT} PROPERTIES | |
| POSITION_INDEPENDENT_CODE ON) | |
| if(CURL_HIDES_PRIVATE_SYMBOLS) | |
| - | set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| + | set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_OPTIONS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS") | |
| endif() | |
| if(CURL_HAS_LTO) | |
| @@ -154,7 +154,7 @@ if(BUILD_STATIC_LIBS) | |
| INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB" | |
| INTERFACE_LINK_DIRECTORIES "${CURL_LIBDIRS}") | |
| if(CURL_HIDES_PRIVATE_SYMBOLS) | |
| - | set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| + | set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_OPTIONS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS") | |
| endif() | |
| if(CURL_HAS_LTO) | |
| @@ -194,7 +194,7 @@ if(BUILD_SHARED_LIBS) | |
| IMPORT_PREFIX "" IMPORT_SUFFIX "${IMPORT_LIB_SUFFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX}" | |
| POSITION_INDEPENDENT_CODE ON) | |
| if(CURL_HIDES_PRIVATE_SYMBOLS) | |
| - | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| + | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_OPTIONS "${CURL_CFLAG_SYMBOLS_HIDE}") |
| set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS") | |
| endif() | |
| if(CURL_HAS_LTO) | |
| @@ -210,9 +210,9 @@ if(BUILD_SHARED_LIBS) | |
| set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_COVERAGE_MACROS}) | |
| set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_OPTIONS ${CURL_COVERAGE_CFLAGS}) | |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) | |
| - | target_link_options(${LIB_SHARED} PRIVATE ${CURL_COVERAGE_LDFLAGS}) |
| + | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY LINK_OPTIONS ${CURL_COVERAGE_LDFLAGS}) |
| else() | |
| - | target_link_libraries(${LIB_SHARED} PRIVATE ${CURL_COVERAGE_LDFLAGS}) |
| + | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY LINK_FLAGS ${CURL_COVERAGE_LDFLAGS}) |
| endif() | |
| endif() | |
| @@ -289,9 +289,9 @@ if(BUILD_SHARED_LIBS) | |
| check_c_source_compiles("int main(void) { return 0; }" HAVE_VERSIONED_SYMBOLS) | |
| if(HAVE_VERSIONED_SYMBOLS) | |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) | |
| - | set_target_properties(${LIB_SHARED} PROPERTIES LINK_OPTIONS "${CMAKE_REQUIRED_LINK_OPTIONS}") |
| + | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY LINK_OPTIONS "${CMAKE_REQUIRED_LINK_OPTIONS}") |
| else() | |
| - | set_target_properties(${LIB_SHARED} PROPERTIES LINK_FLAGS "${CMAKE_REQUIRED_LINK_OPTIONS}") |
| + | set_property(TARGET ${LIB_SHARED} APPEND PROPERTY LINK_FLAGS "${CMAKE_REQUIRED_LINK_OPTIONS}") |
| endif() | |
| else() | |
| message(WARNING "Versioned symbols requested, but not supported by the toolchain.") | |
src/CMakeLists.txt+4 -4
| @@ -123,9 +123,9 @@ endif() | |
| if(ENABLE_UNICODE AND MINGW AND NOT MINGW32CE) | |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) | |
| - | target_link_options(${EXE_NAME} PRIVATE "-municode") |
| + | set_property(TARGET ${EXE_NAME} APPEND PROPERTY LINK_OPTIONS "-municode") |
| else() | |
| - | target_link_libraries(${EXE_NAME} PRIVATE "-municode") |
| + | set_property(TARGET ${EXE_NAME} APPEND PROPERTY LINK_FLAGS "-municode") |
| endif() | |
| endif() | |
| @@ -133,9 +133,9 @@ if(CURL_CODE_COVERAGE) | |
| set_property(TARGET ${EXE_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_COVERAGE_MACROS}) | |
| set_property(TARGET ${EXE_NAME} APPEND PROPERTY COMPILE_OPTIONS ${CURL_COVERAGE_CFLAGS}) | |
| if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) | |
| - | target_link_options(${EXE_NAME} PRIVATE ${CURL_COVERAGE_LDFLAGS}) |
| + | set_property(TARGET ${EXE_NAME} APPEND PROPERTY LINK_OPTIONS ${CURL_COVERAGE_LDFLAGS}) |
| else() | |
| - | target_link_libraries(${EXE_NAME} PRIVATE ${CURL_COVERAGE_LDFLAGS}) |
| + | set_property(TARGET ${EXE_NAME} APPEND PROPERTY LINK_FLAGS ${CURL_COVERAGE_LDFLAGS}) |
| endif() | |
| endif() | |