diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-09-26 21:33:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-09-26 21:33:05 +0000 |
| commit | 571b0b9eded662de1b7b596f22b4fc6688fe96e7 (patch) | |
| tree | 1b4cd05b54588d4fa3f17eb2b6ff636258085a8b /llvm/cmake/modules | |
| parent | 58ae9ae23a67821154eac11421c55d5b1139e0ac (diff) | |
| download | bcm5719-llvm-571b0b9eded662de1b7b596f22b4fc6688fe96e7.tar.gz bcm5719-llvm-571b0b9eded662de1b7b596f22b4fc6688fe96e7.zip | |
Fix misinterpretation of CMake rule found by a CMake warning (related to CMP0054).
lldb sets the variable SHARED_LIBRARY to 1, which breaks this conditional,
because older versions of CMake interpret
if ("${t}" STREQUAL "SHARED_LIBRARY")
as meaning
if ("${t}" STREQUAL "1")
in this case. Change the conditional so it does the right thing with both old
and new CMakes.
llvm-svn: 218542
Diffstat (limited to 'llvm/cmake/modules')
| -rw-r--r-- | llvm/cmake/modules/LLVM-Config.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/cmake/modules/LLVM-Config.cmake b/llvm/cmake/modules/LLVM-Config.cmake index 8ae1d23e4ee..e8c42fc8dc7 100644 --- a/llvm/cmake/modules/LLVM-Config.cmake +++ b/llvm/cmake/modules/LLVM-Config.cmake @@ -40,9 +40,9 @@ function(explicit_llvm_config executable) llvm_map_components_to_libnames(LIBRARIES ${link_components}) get_target_property(t ${executable} TYPE) - if("${t}" STREQUAL "STATIC_LIBRARY") + if("x${t}" STREQUAL "xSTATIC_LIBRARY") target_link_libraries(${executable} ${cmake_2_8_12_INTERFACE} ${LIBRARIES}) - elseif("${t}" STREQUAL "SHARED_LIBRARY" OR "${t}" STREQUAL "MODULE_LIBRARY") + elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL "xMODULE_LIBRARY") target_link_libraries(${executable} ${cmake_2_8_12_PRIVATE} ${LIBRARIES}) else() # Use plain form for legacy user. |
