diff options
| author | Pavel Labath <labath@google.com> | 2016-08-17 11:55:50 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-08-17 11:55:50 +0000 |
| commit | 2f430a19389e001931f24870a5f95ac10bad128e (patch) | |
| tree | c083fb633c50a786b87512c24695cad9b9f73efc | |
| parent | 4b22642e6fb0bceadce788637866456c5c80034e (diff) | |
| download | bcm5719-llvm-2f430a19389e001931f24870a5f95ac10bad128e.tar.gz bcm5719-llvm-2f430a19389e001931f24870a5f95ac10bad128e.zip | |
Remove cmake legacy code
Summary: Cmake 2.8 support is gone and not coming back. We can remove a bit of legacy code now.
Reviewers: zturner
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D23554
llvm-svn: 278924
| -rw-r--r-- | lldb/cmake/modules/AddLLDB.cmake | 6 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBConfig.cmake | 10 | ||||
| -rw-r--r-- | lldb/source/API/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index af16050769a..cf277295a4b 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -4,7 +4,7 @@ function(lldb_link_common_libs name targetkind) endif() if(${targetkind} MATCHES "SHARED") - set(LINK_KEYWORD ${cmake_2_8_12_PUBLIC}) + set(LINK_KEYWORD PUBLIC) endif() if(${targetkind} MATCHES "SHARED" OR ${targetkind} MATCHES "EXE") @@ -62,10 +62,10 @@ macro(add_lldb_library name) if (PARAM_SHARED) if (LLDB_LINKER_SUPPORTS_GROUPS) - target_link_libraries(${name} ${cmake_2_8_12_PUBLIC} + target_link_libraries(${name} PUBLIC -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group) else() - target_link_libraries(${name} ${cmake_2_8_12_PUBLIC} ${CLANG_USED_LIBS}) + target_link_libraries(${name} PUBLIC ${CLANG_USED_LIBS}) endif() endif() llvm_config(${name} ${LLVM_LINK_COMPONENTS} ${LLVM_PRIVATE_LINK_COMPONENTS}) diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index ba192168dae..043b3260484 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -268,16 +268,6 @@ 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 () - include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt index 2ed42cac062..8e9e1fb2278 100644 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -117,5 +117,5 @@ endif() if (LLDB_WRAP_PYTHON) add_dependencies(liblldb swig_wrapper) endif() -target_link_libraries(liblldb ${cmake_2_8_12_PRIVATE} ${LLDB_SYSTEM_LIBS}) +target_link_libraries(liblldb PRIVATE ${LLDB_SYSTEM_LIBS}) |
