diff options
| author | Jakub Zakrzewski <jzakrzewski@e2ebridge.com> | 2014-08-22 16:59:30 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-10-09 13:48:30 +0200 |
| commit | 2257deb50261e1e3193dd40ce92ae4f94ae135a1 (patch) | |
| tree | 09e27ddbe6ac314933db483f4581c79b7c6f2ca3 | |
| parent | fc61870a1c61fecfdc9d446cbdc3e2c190a5e9e3 (diff) | |
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.
| -rw-r--r-- | CMake/Macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake index 80a88339f..b07afc6ac 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) |