소스 검색

Merge pull request #1070 from Areloch/curlCmakeUpdateFix

Fixes up the libCurl module cmake config so it works as expected again
Brian Roberts 2 년 전
부모
커밋
27695e20a3
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      Tools/CMake/modules/module_curl.cmake

+ 4 - 4
Tools/CMake/modules/module_curl.cmake

@@ -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" )