removed not required CURL module, renamed several cmake-build options for be more easy sortable by name

2025-09-01 20:12:40 +02:00 · 2015-09-27 19:46:35 +02:00
parent 4ad684deaf
commit 4bef525bf3
21 changed files with 358 additions and 406 deletions
--- a/mk/cmake/Modules/CurlGetConfig.cmake
+++ b/mk/cmake/Modules/CurlGetConfig.cmake
@@ -0,0 +1,50 @@
+#
+# Curl Get Config
+#
+# IF we are using a system that supports curl-config use it.
+#
+
+IF(CURL_FOUND)
+    IF(UNIX AND NOT APPLE)
+	FIND_PROGRAM( CMAKE_CURL_CONFIG curl-config)
+	MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
+
+	IF(CMAKE_CURL_CONFIG)
+	    IF(STATIC_CURL)
+		# run the curl-config program to get --static-libs
+		EXEC_PROGRAM(sh
+			ARGS "${CMAKE_CURL_CONFIG} --static-libs"
+			OUTPUT_VARIABLE CURL_STATIC_LIBS
+			RETURN_VALUE RET)
+
+		MESSAGE(STATUS "CURL RET = ${RET} libs: [${CURL_STATIC_LIBS}]")
+	    ELSE()
+		SET(RET 1)
+	    ENDIF()
+
+	    IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
+		MESSAGE(STATUS "#2 CURL RET = ${RET}, using CURL static libs")
+		SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
+	    ELSE()
+		EXEC_PROGRAM(sh
+		ARGS "${CMAKE_CURL_CONFIG} --libs"
+		OUTPUT_VARIABLE CURL_DYNAMIC_LIBS
+		RETURN_VALUE RET2)
+
+		IF(RET2 EQUAL 0 AND CURL_DYNAMIC_LIBS)
+		    MESSAGE(STATUS "#2 CURL RET = ${RET2}, using CURL dynamic libs: ${CURL_DYNAMIC_LIBS}")
+		    SET(CURL_LIBRARIES "${CURL_DYNAMIC_LIBS}")
+		ELSE()
+		    MESSAGE(STATUS "#3 CURL RET = ${RET2}, using CURL libs found by cmake: ${CURL_LIBRARIES}")
+		ENDIF()
+	    ENDIF()
+	ENDIF()
+    ENDIF()
+    IF( "${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()
--- a/mk/cmake/Modules/FindCURL.cmake
+++ b/mk/cmake/Modules/FindCURL.cmake
@@ -1,71 +0,0 @@
-# - Find curl
-# Find the native CURL headers and libraries.
-#
-#  CURL_INCLUDE_DIRS - where to find curl/curl.h, etc.
-#  CURL_LIBRARIES    - List of libraries when using curl.
-#  CURL_FOUND        - True if curl found.
-
-# Look for the header file.
-FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h
-                           PATHS /usr/local/include/
-                                 /usr/include/
-                                 /opt/local/include/)
-MARK_AS_ADVANCED(CURL_INCLUDE_DIR)
-
-# Look for the library.
-FIND_LIBRARY(CURL_LIBRARY NAMES curl curl-gnutls
-                          PATHS /usr/local/lib/
-                                /usr/lib/
-                                /opt/local/lib/)
-MARK_AS_ADVANCED(CURL_LIBRARY)
-
-# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR)
-
-IF(CURL_FOUND)
-    SET(CURL_LIBRARIES ${CURL_LIBRARY})
-    SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
-
-    # IF we are using a system that supports curl-config use it
-    # and force using static libs
-    IF(UNIX AND NOT APPLE)
-	FIND_PROGRAM( CMAKE_CURL_CONFIG curl-config)
-	MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
-
-	IF(CMAKE_CURL_CONFIG)
-	    OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
-	    OPTION(FORCE_CURL_DYNAMIC_LIBS "force the use of dynamic libs for CURL" OFF)
-	    MESSAGE(STATUS "Force Curl dynamic: ${FORCE_CURL_DYNAMIC_LIBS}")
-
-	    IF(WANT_STATIC_LIBS AND NOT FORCE_CURL_DYNAMIC_LIBS)
-		# run the curl-config program to get --static-libs
-		EXEC_PROGRAM(sh
-			ARGS "${CMAKE_CURL_CONFIG} --static-libs"
-			OUTPUT_VARIABLE CURL_STATIC_LIBS
-			RETURN_VALUE RET)
-
-		MESSAGE(STATUS "CURL RET = ${RET} libs: [${CURL_STATIC_LIBS}]")
-	    ELSE()
-		SET(RET 1)
-	    ENDIF()
-
-	    IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
-		MESSAGE(STATUS "#2 CURL RET = ${RET}, using CURL static libs")
-		SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
-	    ELSE()
-		EXEC_PROGRAM(sh
-		ARGS "${CMAKE_CURL_CONFIG} --libs"
-		OUTPUT_VARIABLE CURL_STATIC_LIBS
-		RETURN_VALUE RET)
-
-		MESSAGE(STATUS "#2 CURL RET = ${RET}, using CURL dynamic libs: ${CURL_STATIC_LIBS}")
-		SET(CURL_LIBRARIES "${CURL_STATIC_LIBS}")
-	    ENDIF()
-	ENDIF()
-    ENDIF()
-ELSE(CURL_FOUND)
-    SET(CURL_LIBRARIES)
-    SET(CURL_INCLUDE_DIRS)
-ENDIF(CURL_FOUND)
--- a/mk/cmake/Modules/FindFTGL.cmake
+++ b/mk/cmake/Modules/FindFTGL.cmake
@@ -10,10 +10,6 @@
 #
 #

-IF(WANT_STATIC_LIBS)
-	OPTION(FTGL_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
-
 #message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #1 Searching for FTGL lib in custom path: [${FTGL_LIBRARY_PATH}]")

 IF (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
@@ -29,9 +25,9 @@ ELSE (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
            PATHS /usr/local/include 
                  /usr/include)

-  IF (FTGL_STATIC AND NOT FTGL_LIBRARY)
+  IF (STATIC_FTGL AND NOT FTGL_LIBRARY)
    FIND_LIBRARY(FTGL_LIBRARY 
-                  NAMES libftgl.a ftgl libftgl libftgl.dll
+                  NAMES libftgl.a ftgl.a ftgl libftgl libftgl.dll
                  PATHS /usr/local/lib 
                        /usr/lib
                        ${FTGL_LIBRARY_PATH})
--- a/mk/cmake/Modules/FindFontConfig.cmake
+++ b/mk/cmake/Modules/FindFontConfig.cmake
@@ -5,17 +5,13 @@
 #  FONTCONFIG_LIBRARIES    - List of libraries when using FONTCONFIG.
 #  FONTCONFIG_FOUND        - True if FONTCONFIG found.

-IF(WANT_STATIC_LIBS)
-	OPTION(FONTCONFIG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
-
 # Look for the header file.
 FIND_PATH( FONTCONFIG_INCLUDE_DIR NAMES fontconfig/fontconfig.h
                                  DOC "Path in which the file fontconfig/fontconfig.h is located." )
 MARK_AS_ADVANCED(FONTCONFIG_INCLUDE_DIR)

-IF(FONTCONFIG_STATIC)
-	FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig
+IF(STATIC_FONTCONFIG)
+	FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES libfontconfig.a fontconfig.a fontconfig
 					DOC "Path to fontconfig library." )
 ELSE()
 	FIND_LIBRARY( FONTCONFIG_LIBRARY NAMES fontconfig
--- a/mk/cmake/Modules/FindFriBiDi.cmake
+++ b/mk/cmake/Modules/FindFriBiDi.cmake
@@ -28,8 +28,8 @@ set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})

 SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)

-IF(WANT_STATIC_LIBS)
-	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
+IF(STATIC_FriBiDi)
+	SET(FRIBIDI_NAMES libfribidi.a fribidi.a ${FRIBIDI_NAMES})
 ENDIF()

 #MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
--- a/mk/cmake/Modules/FindGLEW.cmake
+++ b/mk/cmake/Modules/FindGLEW.cmake
@@ -35,15 +35,11 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)

-IF(WANT_STATIC_LIBS)
-	OPTION(GLEW_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
-
 find_path(GLEW_INCLUDE_DIR GL/glew.h)

 SET(GLEW_NAMES ${GLEW_NAMES} GLEW glew32 glew glew32s)
-IF(GLEW_STATIC)
-	SET(GLEW_NAMES libGLEW.a libglew32.a libglew.a libglew32s.a ${GLEW_NAMES})
+IF(STATIC_GLEW)
+	SET(GLEW_NAMES libGLEW.a libglew32.a libglew.a libglew32s.a GLEW.a glew32.a glew.a glew32s.a ${GLEW_NAMES})
 ENDIF()

 find_library(GLEW_LIBRARY NAMES ${GLEW_NAMES} PATH_SUFFIXES lib64)
--- a/mk/cmake/Modules/FindGoogleBreakpad.cmake
+++ b/mk/cmake/Modules/FindGoogleBreakpad.cmake
@@ -132,4 +132,4 @@ IF(BREAKPAD_FOUND)
 		#SET(BREAKPAD_FOUND FALSE)
 	ENDIF(BREAKPAD_DUMPSYMS_EXE)
 ENDIF(BREAKPAD_FOUND)
-
+MARK_AS_ADVANCED(BREAKPAD_INCLUDE_DIR)
--- a/mk/cmake/Modules/FindIrcclient.cmake
+++ b/mk/cmake/Modules/FindIrcclient.cmake
@@ -41,11 +41,8 @@ FIND_PATH(IRCCLIENT_INCLUDE_DIR libircclient.h

 SET(IRCCLIENT_FIND_LIBRARIES ircclient)

-OPTION(FORCE_IRCCLIENT_DYNAMIC_LIBS "force the use of dynamic libs for IRCCLIENT" OFF)
-MESSAGE(STATUS "Force IRCCLient dynamic: ${FORCE_IRCCLIENT_DYNAMIC_LIBS}")
-
-IF(WANT_STATIC_LIBS AND NOT FORCE_IRCCLIENT_DYNAMIC_LIBS)
-	SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a)
+IF(STATIC_Ircclient)
+	SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a libircclient ircclient)
 ELSE()
 	SET(IRCCLIENT_FIND_LIBRARIES libircclient ircclient)
 ENDIF()
--- a/mk/cmake/Modules/FindLUA.cmake
+++ b/mk/cmake/Modules/FindLUA.cmake
@@ -51,11 +51,12 @@
 unset(_lua_include_subdirs)
 unset(_lua_library_names)

-IF(WANT_STATIC_LIBS)
-	OPTION(LUA_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
 IF("${FORCE_LUA_VERSION}" STREQUAL "OFF")
-	SET(LUA_VERSIONS5 "${ALL_LUA_VERSIONS_IN_ORDER}")
+	IF(DEFINED ALL_LUA_VERSIONS_IN_ORDER)
+		SET(LUA_VERSIONS5 "${ALL_LUA_VERSIONS_IN_ORDER}")
+	ELSE()
+		SET(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+	ENDIF()
 ELSE()
 	SET(LUA_VERSIONS5 "${FORCE_LUA_VERSION}")
 ENDIF()
@@ -91,12 +92,15 @@ function(set_lua_version_vars)
             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
        )
-        IF(LUA_STATIC)
+        IF(STATIC_LUA)
            list(APPEND _lua_library_names
                liblua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
                liblua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
                liblua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
-             )
+                lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}.a
+                lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
+                lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.a
+        )
        ENDIF()
        list(APPEND _lua_library_names
             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
--- a/mk/cmake/Modules/FindMiniupnpc.cmake
+++ b/mk/cmake/Modules/FindMiniupnpc.cmake
@@ -48,11 +48,10 @@ FIND_PATH(MINIUPNP_INCLUDE_DIR miniupnpc.h
 #message(STATUS "Finding miniupnpc.h result: ${MINIUPNP_INCLUDE_DIR}")

 #find_library(MINIUPNP_LIBRARY miniupnpc)
+set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc miniupnpc)

-IF(WANT_STATIC_LIBS)
-  set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a)
-ELSE()
-  set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc.so miniupnpc)
+IF(STATIC_Miniupnpc)
+  set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a miniupnpc.a ${MINIUPNPC_LIBRARY_NAMES})
 ENDIF()

 FIND_LIBRARY(MINIUPNP_LIBRARY NAMES ${MINIUPNPC_LIBRARY_NAMES})
--- a/mk/cmake/Modules/FindOGG.cmake
+++ b/mk/cmake/Modules/FindOGG.cmake
@@ -6,10 +6,6 @@
 #  VORBIS_FILE_LIBRARY
 #

-IF(WANT_STATIC_LIBS)
-	OPTION(OGG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
-
 # check for cache to avoid littering log
 IF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY)
 	SET(OGG_BE_QUIET TRUE)
@@ -17,14 +13,14 @@ ENDIF()

 FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)

-IF (OGG_STATIC AND NOT OGG_LIBRARY)
-	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
+IF (STATIC_OGG AND NOT OGG_LIBRARY)
+	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg.a ogg)
 ELSE()
 	FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
 ENDIF()

-IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
-	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
+IF (STATIC_OGG AND NOT VORBIS_LIBRARY)
+	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis.a vorbis)
 ELSE()
 	FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis)
 ENDIF()
@@ -33,8 +29,8 @@ ENDIF()
 #IF(NOT APPLE)
 # comment above is full of lies

-IF (OGG_STATIC AND NOT VORBIS_FILE_LIBRARY)
-	FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile)
+IF (STATIC_OGG AND NOT VORBIS_FILE_LIBRARY)
+	FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile.a vorbisfile)
 ELSE()
 	FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES vorbisfile)
 ENDIF()
--- a/mk/cmake/Modules/FindXercesC.cmake
+++ b/mk/cmake/Modules/FindXercesC.cmake
@@ -46,16 +46,12 @@ IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
        #MESSAGE(STATUS "Found cached Xerces-C lib [${XERCESC_LIBRARY}]")
 ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)

-IF(WANT_STATIC_LIBS)
-	OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
-ENDIF()
-
-IF (NOT  ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
+IF (NOT  ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})
 	UNSET(XERCESC_LIBRARY CACHE)
 	UNSET(XERCESC_LIBRARY_DEBUG CACHE)
-ENDIF (NOT  ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
+ENDIF (NOT  ${XERCESC_WAS_STATIC} STREQUAL ${STATIC_XercesC})

-SET(XERCESC_WAS_STATIC ${XERCESC_STATIC} CACHE INTERNAL "" )
+SET(XERCESC_WAS_STATIC ${STATIC_XercesC} CACHE INTERNAL "" )

 IF (XERCESC_INCLUDE_DIR)
    SET(XERCESC_INCLUDE ${XERCESC_INCLUDE_DIR})
@@ -73,7 +69,7 @@ ENDIF()

 #MESSAGE(STATUS "Current Xerces-C lib [${XERCESC_LIBRARY}] XERCESC_INCLUDE [${XERCESC_INCLUDE}")

-IF (XERCESC_STATIC AND NOT XERCESC_LIBRARY)
+IF (STATIC_XercesC AND NOT XERCESC_LIBRARY)
        MESSAGE(STATUS "Looking for static Xerces-C lib...")
 	FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 libxerces-c.a libxerces-c_3.a libxerces-c2_8_0.a libxerces-c_2.a libXerces.a
 	 PATHS
--- a/mk/cmake/Modules/ReqVersAndStaticConf.cmake
+++ b/mk/cmake/Modules/ReqVersAndStaticConf.cmake
@@ -0,0 +1,76 @@
+#
+# Required Versions And Static Config
+#
+# Things related with "Static build" and optional versioning.
+#
+# By assumption in general all should be done in the way that the default dynamic
+# compilation should work even without this file.
+#
+
+IF(WANT_STATIC_LIBS)
+    IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST)
+	# shared lib
+	FOREACH(STATIC_LIB
+		OpenSSL
+		CURL
+		XercesC
+		LUA
+		JPEG
+		PNG
+		FontConfig
+		FTGL
+		GLEW
+		FriBiDi
+		Miniupnpc
+		Ircclient)
+	    LIST(APPEND LIST_OF_STATIC_LIBS_MG "${STATIC_LIB}")
+	ENDFOREACH()
+    ENDIF()
+    IF(BUILD_MEGAGLEST)
+	# only libs not used by shared lib
+	FOREACH(STATIC_LIB
+		OGG)
+	    LIST(APPEND LIST_OF_STATIC_LIBS_MG "${STATIC_LIB}")
+	ENDFOREACH()
+    ENDIF()
+    FOREACH(STATIC_LIB ${LIST_OF_STATIC_LIBS_MG})
+	IF(DEFINED WANT_USE_${STATIC_LIB} AND NOT WANT_USE_${STATIC_LIB})
+	    IF(DEFINED STATIC_${STATIC_LIB})
+		UNSET(STATIC_${STATIC_LIB} CACHE)
+	    ENDIF()
+	ELSE()
+	    OPTION("STATIC_${STATIC_LIB}" "Set to ON to link your project with static library (instead of DLL)." ON)
+	ENDIF()
+    ENDFOREACH()
+ENDIF()
+
+IF(STATIC_OpenSSL)
+    SET(OPENSSL_USE_STATIC_LIBS ON)
+ENDIF()
+
+IF(STATIC_CURL AND UNIX)
+    ADD_DEFINITIONS("-DCURL_STATICLIB")
+ENDIF()
+SET(CURL_MIN_VERSION_MG "7.16.4")
+
+IF(NOT DEFINED FORCE_LUA_VERSION)
+    SET(FORCE_LUA_VERSION "OFF" CACHE STRING "Try to force some specific lua version (for example older). On the list may be also not existing versions yet for future use." FORCE)
+ENDIF()
+SET_PROPERTY(CACHE FORCE_LUA_VERSION PROPERTY STRINGS OFF 5.5 5.4 5.3 5.2 5.1 5.0)
+SET(ALL_LUA_VERSIONS_IN_ORDER 5.3 5.2 5.1 5.4 5.5 5.0)
+
+IF(STATIC_JPEG)
+    SET(JPEG_NAMES jpeg.a libjpeg.a ${JPEG_NAMES})
+ENDIF()
+
+IF(STATIC_PNG)
+    list(APPEND PNG_NAMES png.a libpng.a)
+    set(_PNG_VERSION_SUFFIXES 17 16 15 14 12 18 19 20 21 22)
+    foreach(v IN LISTS _PNG_VERSION_SUFFIXES)
+	list(APPEND PNG_NAMES png${v}.a libpng${v}.a)
+	list(APPEND PNG_NAMES_DEBUG png${v}d.a libpng${v}d.a)
+    endforeach()
+    unset(_PNG_VERSION_SUFFIXES)
+ENDIF()
+
+SET(VLC_MIN_VERSION_MG "1.1.0")