- default to dynamic libs since most (if not ALL) distros hate static linking, still support it for our own installer:
-DWANT_STATIC_LIBS=ON is what you add to cmake call to build with statics libs as we did before
This commit is contained in:
parent
09ec5e095e
commit
4f3ecdf1ec
|
@ -30,13 +30,18 @@ IF(CURL_FOUND)
|
|||
FIND_PROGRAM( CMAKE_CURL_CONFIG curl-config)
|
||||
|
||||
IF(CMAKE_CURL_CONFIG)
|
||||
# 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)
|
||||
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
|
||||
IF(WANT_STATIC_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}")
|
||||
MESSAGE(STATUS "CURL RET = ${RET}")
|
||||
ELSE()
|
||||
SET(RET 1)
|
||||
ENDIF()
|
||||
|
||||
IF(${RET} EQUAL 0)
|
||||
MESSAGE(STATUS "USING CURL STATIC LIBS: ${CURL_STATIC_LIBS}")
|
||||
|
@ -48,7 +53,7 @@ IF(CURL_FOUND)
|
|||
OUTPUT_VARIABLE CURL_STATIC_LIBS
|
||||
RETURN_VALUE RET)
|
||||
|
||||
MESSAGE(STATUS "#2 CURL RET = ${RET} libs: ${CURL_STATIC_LIBS}")
|
||||
MESSAGE(STATUS "#2 CURL RET = ${RET} using CURL dynamic libs: ${CURL_STATIC_LIBS}")
|
||||
SET(CURL_LIBRARIES "${CURL_STATIC_LIBS}")
|
||||
|
||||
ENDIF()
|
||||
|
|
|
@ -46,7 +46,10 @@ IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
|
|||
#MESSAGE(STATUS "Found cached Xerces-C lib [${XERCESC_LIBRARY}]")
|
||||
ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
|
||||
|
||||
OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
|
||||
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
|
||||
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})
|
||||
UNSET(XERCESC_LIBRARY CACHE)
|
||||
|
|
Loading…
Reference in New Issue