iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Update curl to 7.72.0

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7176 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c1304bcee47eaaefacf53ea76b5c3faf06b50ee4
Former-commit-id: 6bc49ab1b899ac27698bfa11b0168a952c877886
This commit is contained in:
beaglejoe 2020-08-28 06:24:28 +00:00
parent 040f3231c9
commit c0e4cdf485
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packaging/3rdParty-devel/CMakeLists.txt
View file

@ -141,7 +141,7 @@ if(OPTION_SDL_2x)
CMAKE_ARGS ${SDL2_ARGS} CMAKE_ARGS ${SDL2_ARGS}
DEPENDS OpenGL-headers DEPENDS OpenGL-headers
) )
message(WARNING "Remove the step below when SDL2 CMake is fixed") message(STATUS "Remove the step below when SDL2 CMake is fixed")
ExternalProject_Add_Step(${SDL2_PROJECT} sdl2_fix_cmake ExternalProject_Add_Step(${SDL2_PROJECT} sdl2_fix_cmake
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/patches/sdl-2.0.12.CMakeLists.txt" "${CMAKE_SOURCE_DIR}/patches/sdl-2.0.12.CMakeLists.txt"
@ -422,11 +422,11 @@ else(OPTION_FREETYPE)
endif(OPTION_FREETYPE) endif(OPTION_FREETYPE)
if(OPTION_CURL) if(OPTION_CURL)
set(CURL_PROJECT curl-7.71.1) set(CURL_PROJECT curl-7.72.0)
set(CURL_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_TESTING=Off -DCMAKE_DEBUG_POSTFIX=) set(CURL_ARGS ${EXTERNALS_CMAKE_ARGS} -DBUILD_TESTING=Off -DCMAKE_DEBUG_POSTFIX=)
ExternalProject_Add(${CURL_PROJECT} ExternalProject_Add(${CURL_PROJECT}
URL https://curl.haxx.se/download/curl-7.71.1.tar.bz2 URL https://curl.haxx.se/download/curl-7.72.0.tar.bz2
URL_HASH SHA256=9d52a4d80554f9b0d460ea2be5d7be99897a1a9f681ffafe739169afd6b4f224 URL_HASH SHA256=ad91970864102a59765e20ce16216efc9d6ad381471f7accceceab7d905703ef
CMAKE_ARGS ${CURL_ARGS} CMAKE_ARGS ${CURL_ARGS}
DEPENDS ${ZLIB_PROJECT} DEPENDS ${ZLIB_PROJECT}
) )
@ -437,6 +437,12 @@ endif(OPTION_CURL)
if(OPTION_OSG) if(OPTION_OSG)
set(OSG_ARGS ${EXTERNALS_CMAKE_ARGS} -DCMAKE_DEBUG_POSTFIX='' -DUSE_3RDPARTY_BIN=Off) set(OSG_ARGS ${EXTERNALS_CMAKE_ARGS} -DCMAKE_DEBUG_POSTFIX='' -DUSE_3RDPARTY_BIN=Off)
message(STATUS "Remove the block below when curl fixes their CURLConfig.cmake or OSG fixes it")
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.17.0")
list(APPEND OSG_ARGS -DCURL_NO_CURL_CMAKE=ON)
endif(NOT ${CMAKE_VERSION} VERSION_LESS "3.17.0")
message(STATUS "OSG_ARGS = ${OSG_ARGS}")
# if(MSVC_VERSION LESS 1900) # if(MSVC_VERSION LESS 1900)
# message("Disable Targa plugin, OSG newer than 3.6.3 need Visual Studio 2015") # message("Disable Targa plugin, OSG newer than 3.6.3 need Visual Studio 2015")
# set(OSG_ARGS ${OSG_ARGS} -D BUILD_OSG_PLUGIN_TGA=0) # set(OSG_ARGS ${OSG_ARGS} -D BUILD_OSG_PLUGIN_TGA=0)