maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Saleem Abdulrasool 2014-07-20 05:28:55 +00:00
parent 03074dd83e
commit e1401eb747
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/CMakeLists.txt
View File

@ -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 ()

2
lldb/source/CMakeLists.txt
View File

@ -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.