From e8921d43de690f7bf45c1d7484b9ee1f63260bb5 Mon Sep 17 00:00:00 2001 From: Jakub Zakrzewski Date: Fri, 22 Aug 2014 16:59:30 +0200 Subject: [PATCH 3/5] Cmake: Avoid cycle directory dependencies. Because we prepended libraries to list, CMake had troubles resolving link directory order as it detected some cycles. Appending to list ensures that dependencies will preceed dependees. --- CMake/Macros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake index 80a8833..b07afc6 100644 --- a/CMake/Macros.cmake +++ b/CMake/Macros.cmake @@ -1,12 +1,12 @@ #File defines convenience macros for available feature testing # This macro checks if the symbol exists in the library and if it -# does, it prepends library to the list. +# does, it appends library to the list. macro(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) - check_library_exists("${LIBRARY};${CURL_LIBS}" ${SYMBOL} "${CMAKE_LIBRARY_PATH}" + check_library_exists("${CURL_LIBS};${LIBRARY}" ${SYMBOL} "${CMAKE_LIBRARY_PATH}" ${VARIABLE}) if(${VARIABLE}) - set(CURL_LIBS ${LIBRARY} ${CURL_LIBS}) + list(APPEND CURL_LIBS ${LIBRARY}) endif(${VARIABLE}) endmacro(CHECK_LIBRARY_EXISTS_CONCAT) -- 1.8.1.4