From e1401eb7477dab53d3455b9876b6a867387007b1 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 20 Jul 2014 05:28:55 +0000 Subject: [PATCH] build: fix cmake warning with newer CMake Hoist the compatibility macros out a level and re-use them when adding link dependencies. Silences a warning from CMake. llvm-svn: 213469 --- lldb/CMakeLists.txt | 20 ++++++++++---------- lldb/source/CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 142847e..94a1281 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -197,6 +197,16 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLDB_VERSION ${PACKAGE_VERSION}) message(STATUS "LLDB version: ${LLDB_VERSION}") +if (CMAKE_VERSION VERSION_LESS 2.8.12) + set(cmake_2_8_12_INTERFACE) + set(cmake_2_8_12_PRIVATE) + set(cmake_2_8_12_PUBLIC) +else () + set(cmake_2_8_12_INTERFACE INTERFACE) + set(cmake_2_8_12_PRIVATE PRIVATE) + set(cmake_2_8_12_PUBLIC PUBLIC) +endif () + macro(add_lldb_library name) llvm_process_sources(srcs ${ARGN}) if (MSVC_IDE OR XCODE) @@ -222,16 +232,6 @@ macro(add_lldb_library name) ##add_dependencies(${name} ${LLVM_COMMON_DEPENDS}) #endif() - if (CMAKE_VERSION VERSION_LESS 2.8.12) - set(cmake_2_8_12_INTERFACE) - set(cmake_2_8_12_PRIVATE) - set(cmake_2_8_12_PUBLIC) - else () - set(cmake_2_8_12_INTERFACE INTERFACE) - set(cmake_2_8_12_PRIVATE PRIVATE) - set(cmake_2_8_12_PUBLIC PUBLIC) - endif () - if ("${libkind}" STREQUAL "STATIC") set(lldb_library_keyword ${cmake_2_8_12_INTERFACE}) else () diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt index 8239fe6..8eb413d 100644 --- a/lldb/source/CMakeLists.txt +++ b/lldb/source/CMakeLists.txt @@ -300,7 +300,7 @@ if (LLDB_WRAP_PYTHON OR LLDB_VERS_GENERATED_FILE) ${LLDB_VERS_GENERATED_FILE} ) endif() -target_link_libraries(liblldb ${LLDB_SYSTEM_LIBS}) +target_link_libraries(liblldb ${cmake_2_8_12_PRIVATE} ${LLDB_SYSTEM_LIBS}) # Determine LLDB revision and repository. GetSourceVersion and GetRepositoryPath are shell-scripts, and as # such will not work on Windows. -- 2.7.4