LIBS: renamed cmake directory to match upstream

master
Martin Gerhardy 2018-07-02 19:52:42 +02:00
parent 11bfd3850e
commit 7e9f83c7fc
9 changed files with 5 additions and 5 deletions

View File

@ -155,7 +155,7 @@ update-simplexnoise:
update-curl:
$(call UPDATE_GIT,curl,https://github.com/curl/curl.git)
cp $(UPDATEDIR)/curl.sync/lib/*.[ch]* contrib/libs/libcurl/lib
cp -r $(UPDATEDIR)/curl.sync/CMake/* contrib/libs/libcurl/cmake
cp -r $(UPDATEDIR)/curl.sync/CMake/* contrib/libs/libcurl/CMake
cp $(UPDATEDIR)/curl.sync/lib/vauth/*.[ch]* contrib/libs/libcurl/lib/vauth
cp $(UPDATEDIR)/curl.sync/lib/vtls/*.[ch]* contrib/libs/libcurl/lib/vtls
cp $(UPDATEDIR)/curl.sync/include/curl/*.[ch]* contrib/libs/libcurl/include/curl

View File

@ -38,7 +38,7 @@ macro(CURL_INTERNAL_TEST CURL_TEST)
message(STATUS "Performing Curl Test ${CURL_TEST}")
try_compile(${CURL_TEST}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cmake/CurlTests.c
${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
"${CURL_TEST_ADD_LIBRARIES}"
OUTPUT_VARIABLE OUTPUT)
@ -70,7 +70,7 @@ macro(CURL_INTERNAL_TEST_RUN CURL_TEST)
message(STATUS "Performing Curl Test ${CURL_TEST}")
try_run(${CURL_TEST} ${CURL_TEST}_COMPILE
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cmake/CurlTests.c
${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
"${CURL_TEST_ADD_LIBRARIES}"
OUTPUT_VARIABLE OUTPUT)

View File

@ -70,7 +70,7 @@ endforeach()
if (NOT CURL_FOUND)
set(CURL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(CURL_BINARY_DIR ${CMAKE_BINARY_DIR})
set(CMAKE_MODULE_PATH "${CURL_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH "${CURL_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
include(Utilities)
include(Macros)
include(CMakeDependentOption)
@ -152,7 +152,7 @@ if (NOT CURL_FOUND)
# On windows preload settings
if(WIN32)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WINSOCKAPI_=")
include(${CURL_SOURCE_DIR}/cmake/Platforms/WindowsCache.cmake)
include(${CURL_SOURCE_DIR}/CMake/Platforms/WindowsCache.cmake)
endif(WIN32)
if(ENABLE_THREADED_RESOLVER)