TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1070 from Areloch/curlCmakeUpdateFix

Browse source 
Fixes up the libCurl module cmake config so it works as expected again
This commit is contained in:
Brian Roberts 2023-08-03 17:14:25 -05:00 committed by GitHub
parent 3c2bc3aaac cac793f437
commit 27695e20a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Tools/CMake/modules/module_curl.cmake
View file

@ -48,11 +48,11 @@ elseif(APPLE)
set(CURL_USE_OPENSSL OFF CACHE INTERNAL "" FORCE)
set(CURL_USE_SECTRANSP ON CACHE INTERNAL "" FORCE)
endif()
add_subdirectory( ${libDir}/curl ${CMAKE_CURRENT_BINARY_DIR}/curl)
add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/curl" "${CMAKE_CURRENT_BINARY_DIR}/curl")
set(CURL_LIBRARIES libcurl)
set(CURL_INCLUDE_DIRS "${libDir}/curl/include")
set(CURL_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/Engine/lib/curl/include")
set_property(TARGET libcurl APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS CURL_STATICLIB)
addLib(${CURL_LIBRARIES})
addInclude(${CURL_INCLUDE_DIRS})
set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} libcurl)
set(TORQUE_INCLUDE_DIRECTORIES ${TORQUE_INCLUDE_DIRECTORIES} "${CMAKE_SOURCE_DIR}/Engine/lib/curl/src" )