diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-08-09 15:41:15 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-08-09 15:41:15 +0100 |
| commit | 2355224c8b76c54dff6a8781c8ea761ce6cd53d8 (patch) | |
| tree | a680cdccfaa180990c814c947598103c6e4f37e6 /scripts | |
| parent | d8d55a57d5b09934a94b3542f64b0c0d40113697 (diff) | |
| download | mariadb-git-2355224c8b76c54dff6a8781c8ea761ce6cd53d8.tar.gz | |
Don't try to remove from an empty list.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 5831679828c..e97b664d106 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -253,24 +253,26 @@ ENDIF() # Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable # returned string in ${var} is can be passed to linker's command line MACRO(EXTRACT_LINK_LIBRARIES target var) - LIST(REMOVE_ITEM ${target}_LIB_DEPENDS "") - LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) - FOREACH(lib ${${target}_LIB_DEPENDS}) - # Filter out "general", it is not a library, just CMake hint - # Also, remove duplicates - IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") - IF (lib MATCHES "^\\-l") - SET(${var} "${${var}} ${lib} ") - ELSEIF(lib MATCHES "^/") - # Full path, convert to just filename, strip "lib" prefix and extension - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) + IF(${target}_LIB_DEPENDS) + LIST(REMOVE_ITEM ${target}_LIB_DEPENDS "") + LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) + FOREACH(lib ${${target}_LIB_DEPENDS}) + # Filter out "general", it is not a library, just CMake hint + # Also, remove duplicates + IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") + IF (lib MATCHES "^\\-l") + SET(${var} "${${var}} ${lib} ") + ELSEIF(lib MATCHES "^/") + # Full path, convert to just filename, strip "lib" prefix and extension + GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() ENDIF() - ENDIF() - ENDFOREACH() + ENDFOREACH() + ENDIF() IF(MSVC) STRING(REPLACE "-l" "" ${var} "${${var}}") ENDIF() |