More fixes to cmake builds
- Add icons to windows exes. - Revert removal of CurlGetConfig.cmake. This is still required in ubuntu. (Perhaps only for static builds.)
This commit is contained in:
parent
e9b554c2b4
commit
c5245a9e73
|
@ -0,0 +1,63 @@
|
|||
#
|
||||
# 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()
|
|
@ -207,6 +207,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
|||
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
|
||||
IF(WIN32)
|
||||
# Must come after ADD_EXECUTABLE.
|
||||
TARGET_SOURCES(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/mk/windoze/g3d_viewer.rc)
|
||||
ENDIF()
|
||||
|
||||
IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||
ENDIF()
|
||||
|
|
|
@ -92,6 +92,7 @@ IF(BUILD_MEGAGLEST)
|
|||
ENDIF()
|
||||
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
INCLUDE(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/CurlGetConfig.cmake)
|
||||
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
|
||||
IF(UNIX)
|
||||
IF(NOT OPENSSL_FOUND)
|
||||
|
@ -296,6 +297,7 @@ IF(BUILD_MEGAGLEST)
|
|||
endif()
|
||||
|
||||
IF(WIN32)
|
||||
TARGET_SOURCES(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/mk/windoze/glest.rc)
|
||||
IF(VCPKG_TARGET_TRIPLET)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} odbc32 wsock32 winspool winmm shell32 comctl32 advapi32 opengl32 glu32 ole32 oleaut32 uuid ddraw dsound dxguid ws2_32 iphlpapi gdi32 user32 kernel32 dbghelp shlwapi)
|
||||
find_package(Ogg CONFIG REQUIRED)
|
||||
|
|
|
@ -194,6 +194,11 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
|||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
# Must come after ADD_EXECUTABLE.
|
||||
TARGET_SOURCES(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/mk/windoze/glest_editor.rc)
|
||||
ENDIF()
|
||||
|
||||
SET(MG_STREFLOP "")
|
||||
IF(WANT_USE_STREFLOP)
|
||||
SET(MG_STREFLOP "streflop")
|
||||
|
|
|
@ -93,6 +93,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
|
|||
ENDIF()
|
||||
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
INCLUDE(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/CurlGetConfig.cmake)
|
||||
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
|
||||
IF(UNIX)
|
||||
IF(NOT OPENSSL_FOUND)
|
||||
|
|
Loading…
Reference in New Issue