mirror of
https://github.com/glest/glest-source.git
synced 2025-09-01 12:02:36 +02:00
another test for macOS
This commit is contained in:
@@ -5,16 +5,23 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
IF(CURL_FOUND)
|
IF(CURL_FOUND)
|
||||||
#IF(UNIX AND NOT APPLE)
|
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
FIND_PROGRAM(CMAKE_CURL_CONFIG curl-config
|
IF(UNIX AND APPLE AND NOT CMAKE_CURL_CONFIG)
|
||||||
PATHS
|
FIND_PROGRAM(CMAKE_CURL_CONFIG curl-config
|
||||||
~/Library/Frameworks
|
PATHS /opt/local
|
||||||
/Library/Frameworks
|
PATH_SUFFIXES bin NO_DEFAULT_PATH)
|
||||||
/sw # Fink
|
ENDIF()
|
||||||
/opt/local # DarwinPorts
|
IF(NOT CMAKE_CURL_CONFIG)
|
||||||
/opt/csw # Blastwave
|
FIND_PROGRAM(CMAKE_CURL_CONFIG curl-config
|
||||||
/opt)
|
PATHS
|
||||||
|
~/Library/Frameworks
|
||||||
|
/Library/Frameworks
|
||||||
|
/sw # Fink
|
||||||
|
/opt/local # DarwinPorts
|
||||||
|
/opt/csw # Blastwave
|
||||||
|
/opt
|
||||||
|
PATH_SUFFIXES bin)
|
||||||
|
ENDIF()
|
||||||
MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
|
MARK_AS_ADVANCED(CMAKE_CURL_CONFIG)
|
||||||
|
|
||||||
IF(CMAKE_CURL_CONFIG)
|
IF(CMAKE_CURL_CONFIG)
|
||||||
@@ -24,14 +31,12 @@ IF(CURL_FOUND)
|
|||||||
OUTPUT_VARIABLE CURL_STATIC_LIBS
|
OUTPUT_VARIABLE CURL_STATIC_LIBS
|
||||||
RESULT_VARIABLE RET
|
RESULT_VARIABLE RET
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
MESSAGE(STATUS "CURL RET = ${RET} libs: [${CURL_STATIC_LIBS}]")
|
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(RET 1)
|
SET(RET 1)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
|
IF(RET EQUAL 0 AND CURL_STATIC_LIBS)
|
||||||
MESSAGE(STATUS "#2 CURL RET = ${RET}, using 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}")
|
SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}")
|
||||||
ELSE()
|
ELSE()
|
||||||
execute_process(COMMAND ${CMAKE_CURL_CONFIG} --libs
|
execute_process(COMMAND ${CMAKE_CURL_CONFIG} --libs
|
||||||
@@ -40,10 +45,10 @@ IF(CURL_FOUND)
|
|||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
IF(RET2 EQUAL 0 AND CURL_DYNAMIC_LIBS)
|
IF(RET2 EQUAL 0 AND CURL_DYNAMIC_LIBS)
|
||||||
MESSAGE(STATUS "#2 CURL RET = ${RET2}, using CURL dynamic libs: ${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}")
|
SET(CURL_LIBRARIES "${CURL_DYNAMIC_LIBS}")
|
||||||
ELSE()
|
ELSE()
|
||||||
MESSAGE(STATUS "#3 CURL RET = ${RET2}, using CURL libs found by cmake: ${CURL_LIBRARIES}")
|
MESSAGE(STATUS "curl-config: ${CMAKE_CURL_CONFIG}, #3 RET = ${RET}/${RET2}, using CURL libs found by cmake: ${CURL_LIBRARIES}")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
Reference in New Issue
Block a user