From c09fea0308b24b0c9d432d9af8afafc25878d9b1 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 28 Feb 2011 18:41:04 +0000 Subject: [PATCH] - thanks for reporting issues in RHEL wng-, this hopefully fixes builds in that environment --- mk/cmake/Modules/FindCURL.cmake | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mk/cmake/Modules/FindCURL.cmake b/mk/cmake/Modules/FindCURL.cmake index 2b30247c..489cf1a0 100644 --- a/mk/cmake/Modules/FindCURL.cmake +++ b/mk/cmake/Modules/FindCURL.cmake @@ -36,7 +36,22 @@ IF(CURL_FOUND) OUTPUT_VARIABLE CURL_STATIC_LIBS RETURN_VALUE RET) - SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}") + MESSAGE(STATUS "CURL RET = ${RET}") + + IF(${RET} EQUAL 0) + MESSAGE(STATUS "USING CURL STATIC LIBS: ${CURL_STATIC_LIBS}") + SET(CURL_LIBRARIES "-Bstatic ${CURL_STATIC_LIBS}") + ELSE() + + EXEC_PROGRAM(sh + ARGS "${CMAKE_CURL_CONFIG}" + OUTPUT_VARIABLE CURL_STATIC_LIBS + RETURN_VALUE RET) + + MESSAGE(STATUS "#2 CURL RET = ${RET} libs: ${CURL_STATIC_LIBS}") + SET(CURL_LIBRARIES "${CURL_STATIC_LIBS}") + + ENDIF() ENDIF() ENDIF() ELSE(CURL_FOUND)