nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-04 17:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Fixed cmake test cURL support

Browse Source
This commit is contained in:
olszomal 2024-04-10 15:50:58 +02:00 committed by Michał Trojnara
parent d9f0a8dade
commit 7a5389b719
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -66,14 +66,16 @@ target_include_directories(osslsigncode PRIVATE ${OPENSSL_INCLUDE_DIR})
target_link_libraries(osslsigncode PRIVATE ${OPENSSL_LIBRARIES}) target_link_libraries(osslsigncode PRIVATE ${OPENSSL_LIBRARIES})
# set cURL includes/libraries # set cURL includes/libraries
if(OPENSSL_VERSION VERSION_LESS "3.0.0" AND CURL_FOUND) if(OPENSSL_VERSION VERSION_LESS "3.0.0")
if(CURL_FOUND)
target_compile_definitions(osslsigncode PRIVATE ENABLE_CURL=1) target_compile_definitions(osslsigncode PRIVATE ENABLE_CURL=1)
target_include_directories(osslsigncode PRIVATE ${CURL_INCLUDE_DIRS}) target_include_directories(osslsigncode PRIVATE ${CURL_INCLUDE_DIRS})
target_link_libraries(osslsigncode PRIVATE ${CURL_LIBRARIES}) target_link_libraries(osslsigncode PRIVATE ${CURL_LIBRARIES})
message(STATUS "cURL support enabled") message(STATUS "cURL support enabled")
else(OPENSSL_VERSION VERSION_LESS "3.0.0" AND CURL_FOUND) else(CURL_FOUND)
message(STATUS "cURL support disabled (library not found)") message(STATUS "cURL support disabled (library not found)")
endif(OPENSSL_VERSION VERSION_LESS "3.0.0" AND CURL_FOUND) endif(CURL_FOUND)
endif(OPENSSL_VERSION VERSION_LESS "3.0.0")
if(NOT ZLIB_FOUND) if(NOT ZLIB_FOUND)
message(FATAL_ERROR "Zlib library not found") message(FATAL_ERROR "Zlib library not found")

6
cmake/CMakeTest.cmake
View File

@ -454,7 +454,7 @@ foreach(file ${files})
endforeach(file ${files}) endforeach(file ${files})
if((Python3_FOUND OR server_error) AND CURL_FOUND) if((Python3_FOUND OR server_error) AND (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0" OR CURL_FOUND))
### Sign with Time-Stamp Authority ### ### Sign with Time-Stamp Authority ###
@ -724,9 +724,9 @@ endforeach(ext ${extensions_nocat})
message(STATUS "Keep HTTP server after tests") message(STATUS "Keep HTTP server after tests")
endif(STOP_SERVER) endif(STOP_SERVER)
else((Python3_FOUND OR server_error) AND CURL_FOUND) else((Python3_FOUND OR server_error) AND (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0" OR CURL_FOUND))
message(STATUS "CTest skips some tests") message(STATUS "CTest skips some tests")
endif((Python3_FOUND OR server_error) AND CURL_FOUND) endif((Python3_FOUND OR server_error) AND (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0" OR CURL_FOUND))
# Delete test files # Delete test files
set(names "legacy" "signed" "signed_crldp" "nested" "revoked" "removed" "added") set(names "legacy" "signed" "signed_crldp" "nested" "revoked" "removed" "added")