From 4be23261cc34b77055baa5cd18013863c6c43cc9 Mon Sep 17 00:00:00 2001
From: andy5995 <andy400-dev@yahoo.com>
Date: Wed, 3 Oct 2018 01:19:03 -0500
Subject: [PATCH] curl:use cmake module

---
 mk/cmake/Modules/CurlGetConfig.cmake | 63 ----------------------------
 source/glest_game/CMakeLists.txt     |  3 +-
 source/shared_lib/CMakeLists.txt     |  8 +---
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 mk/cmake/Modules/CurlGetConfig.cmake

diff --git a/mk/cmake/Modules/CurlGetConfig.cmake b/mk/cmake/Modules/CurlGetConfig.cmake
deleted file mode 100644
index a583889f5..000000000
--- a/mk/cmake/Modules/CurlGetConfig.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Curl Get Config
-#
-# IF we are using a system that supports curl-config use it.
-#
-
-IF(CURL_FOUND)
-    IF(UNIX)
-	IF(UNIX AND APPLE AND NOT CMAKE_CURL_CONFIG)
-	    FIND_PROGRAM(CMAKE_CURL_CONFIG curl-config
-			PATHS /opt/local
-			PATH_SUFFIXES bin NO_DEFAULT_PATH)
-	ENDIF()
-	IF(NOT CMAKE_CURL_CONFIG)
-	    FIND_PROGRAM(CMAKE_CURL_CONFIG curl-config
-			PATHS
-			~/Library/Frameworks
-			/Library/Frameworks
-			/sw # Fink
-			/opt/local # DarwinPorts
-			/opt/csw # Blastwave
-			/opt
-			PATH_SUFFIXES bin)
-	ENDIF()
-	MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
-
-	IF(CMAKE_CURL_CONFIG)
-	    IF(STATIC_CURL)
-		# run the curl-config program to get --static-libs
-		execute_process(COMMAND ${CMAKE_CURL_CONFIG} --static-libs
-				OUTPUT_VARIABLE CURL_STATIC_LIBS
-				RESULT_VARIABLE RET
-				OUTPUT_STRIP_TRAILING_WHITESPACE)
-	    ELSE()
-		SET(RET 1)
-	    ENDIF()
-
-	    IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
-		MESSAGE(STATUS "curl-config: ${CMAKE_CURL_CONFIG}, #1 , using CURL static libs: [${CURL_STATIC_LIBS}]")
-		SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
-	    ELSE()
-		execute_process(COMMAND ${CMAKE_CURL_CONFIG} --libs
-				OUTPUT_VARIABLE CURL_DYNAMIC_LIBS
-				RESULT_VARIABLE RET2
-				OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-		IF(RET2 EQUAL 0 AND CURL_DYNAMIC_LIBS)
-		    MESSAGE(STATUS "curl-config: ${CMAKE_CURL_CONFIG}, #2 RET = ${RET}, using CURL dynamic libs: ${CURL_DYNAMIC_LIBS}")
-		    SET(CURL_LIBRARIES "${CURL_DYNAMIC_LIBS}")
-		ELSE()
-		    MESSAGE(STATUS "curl-config: ${CMAKE_CURL_CONFIG}, #3 RET = ${RET}/${RET2}, using CURL libs found by cmake: ${CURL_LIBRARIES}")
-		ENDIF()
-	    ENDIF()
-	ENDIF()
-    ENDIF()
-    IF(CURL_VERSION_STRING AND "${CURL_VERSION_STRING}" VERSION_LESS "${CURL_MIN_VERSION_MG}")
-	MESSAGE(STATUS "(please visit http://curl.haxx.se/libcurl/ to find a newer version)")
-	MESSAGE(FATAL_ERROR " CURL version = [${CURL_VERSION_STRING}] we require AT LEAST [7.16.4]")
-    ENDIF()
-ELSE()
-    SET(CURL_LIBRARIES)
-    SET(CURL_INCLUDE_DIRS)
-ENDIF()
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 850304d0d..5898f5d9c 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -94,8 +94,7 @@ IF(BUILD_ZETAGLEST)
 		ENDIF()
 	ENDIF()
 
-	FIND_PACKAGE(CURL REQUIRED)
-	INCLUDE(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/CurlGetConfig.cmake)
+	include(FindCURL)
 	INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 	IF(UNIX)
 		IF(NOT OPENSSL_FOUND)
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 44eff6ff1..0ec9eec4c 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -64,7 +64,6 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5)
-		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include)
 
@@ -86,8 +85,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
 		ENDIF()
 	ENDIF()
 
-	FIND_PACKAGE(CURL REQUIRED)
-	INCLUDE(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/CurlGetConfig.cmake)
+	include(FindCURL)
 	INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 	IF(UNIX)
 		IF(NOT OPENSSL_FOUND)
@@ -467,10 +465,6 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
 		ADD_DEFINITIONS("-DDEBUG")
 	ENDIF()
 
-	IF(WIN32)
-	  TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32  advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 stdc++ moldname mingwex msvcrt user32 kernel32)
-	ENDIF()
-
 	IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
 		TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
 	ENDIF()