Author: labath Date: Wed Aug 17 06:55:50 2016 New Revision: 278924 URL: http://llvm.org/viewvc/llvm-project?rev=278924&view=rev Log: 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 Modified: lldb/trunk/cmake/modules/AddLLDB.cmake lldb/trunk/cmake/modules/LLDBConfig.cmake lldb/trunk/source/API/CMakeLists.txt Modified: lldb/trunk/cmake/modules/AddLLDB.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=278924&r1=278923&r2=278924&view=diff ============================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake (original) +++ lldb/trunk/cmake/modules/AddLLDB.cmake Wed Aug 17 06:55:50 2016 @@ -4,7 +4,7 @@ function(lldb_link_common_libs name targ 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}) Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=278924&r1=278923&r2=278924&view=diff ============================================================================== --- lldb/trunk/cmake/modules/LLDBConfig.cmake (original) +++ lldb/trunk/cmake/modules/LLDBConfig.cmake Wed Aug 17 06:55:50 2016 @@ -268,16 +268,6 @@ string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[ ${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 Modified: lldb/trunk/source/API/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/CMakeLists.txt?rev=278924&r1=278923&r2=278924&view=diff ============================================================================== --- lldb/trunk/source/API/CMakeLists.txt (original) +++ lldb/trunk/source/API/CMakeLists.txt Wed Aug 17 06:55:50 2016 @@ -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}) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
