[Lldb-commits] [PATCH] D23554: Remove cmake legacy code
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Wed Aug 17 05:03:59 PDT 2016
This revision was automatically updated to reflect the committed changes.
Closed by commit rL278924: Remove cmake legacy code (authored by labath).
Changed prior to commit:
https://reviews.llvm.org/D23554?vs=68172&id=68338#toc
Repository:
rL LLVM
https://reviews.llvm.org/D23554
Files:
lldb/trunk/cmake/modules/AddLLDB.cmake
lldb/trunk/cmake/modules/LLDBConfig.cmake
lldb/trunk/source/API/CMakeLists.txt
Index: lldb/trunk/source/API/CMakeLists.txt
===================================================================
--- lldb/trunk/source/API/CMakeLists.txt
+++ lldb/trunk/source/API/CMakeLists.txt
@@ -117,5 +117,5 @@
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})
Index: lldb/trunk/cmake/modules/AddLLDB.cmake
===================================================================
--- lldb/trunk/cmake/modules/AddLLDB.cmake
+++ lldb/trunk/cmake/modules/AddLLDB.cmake
@@ -4,7 +4,7 @@
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 @@
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})
Index: lldb/trunk/cmake/modules/LLDBConfig.cmake
===================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake
@@ -268,16 +268,6 @@
${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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23554.68338.patch
Type: text/x-patch
Size: 2063 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160817/03be1324/attachment.bin>
More information about the lldb-commits
mailing list