diff options
| -rw-r--r-- | clang/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | clang/examples/AnnotateFunctions/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/examples/PrintFunctionNames/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/examples/analyzer-plugin/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 18 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index fce82295508..40ba3fdd31a 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -1,19 +1,5 @@ cmake_minimum_required(VERSION 3.4.3) -# FIXME: It may be removed when we use 2.8.12. -if(CMAKE_VERSION VERSION_LESS 2.8.12) - # Invalidate a couple of keywords. - set(cmake_2_8_12_INTERFACE) - set(cmake_2_8_12_PRIVATE) -else() - # Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries(). - set(cmake_2_8_12_INTERFACE INTERFACE) - set(cmake_2_8_12_PRIVATE PRIVATE) - if(POLICY CMP0022) - cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required - endif() -endif() - # If we are not building as a part of LLVM, build Clang as an # standalone project, using LLVM as an external library: if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) @@ -421,7 +407,7 @@ macro(add_clang_library name) llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS} ${srcs}) if(TARGET ${name}) - target_link_libraries(${name} ${cmake_2_8_12_INTERFACE} ${LLVM_COMMON_LIBS}) + target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS}) if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libclang") install(TARGETS ${name} diff --git a/clang/examples/AnnotateFunctions/CMakeLists.txt b/clang/examples/AnnotateFunctions/CMakeLists.txt index 10e16f254df..cf564d527d6 100644 --- a/clang/examples/AnnotateFunctions/CMakeLists.txt +++ b/clang/examples/AnnotateFunctions/CMakeLists.txt @@ -1,7 +1,7 @@ add_llvm_loadable_module(AnnotateFunctions AnnotateFunctions.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(AnnotateFunctions ${cmake_2_8_12_PRIVATE} + target_link_libraries(AnnotateFunctions PRIVATE clangAST clangBasic clangFrontend diff --git a/clang/examples/PrintFunctionNames/CMakeLists.txt b/clang/examples/PrintFunctionNames/CMakeLists.txt index e700281ab48..5a00d5036fb 100644 --- a/clang/examples/PrintFunctionNames/CMakeLists.txt +++ b/clang/examples/PrintFunctionNames/CMakeLists.txt @@ -12,7 +12,7 @@ endif() add_llvm_loadable_module(PrintFunctionNames PrintFunctionNames.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(PrintFunctionNames ${cmake_2_8_12_PRIVATE} + target_link_libraries(PrintFunctionNames PRIVATE clangAST clangBasic clangFrontend diff --git a/clang/examples/analyzer-plugin/CMakeLists.txt b/clang/examples/analyzer-plugin/CMakeLists.txt index 1788d6c5cac..dcbe5c4e0e9 100644 --- a/clang/examples/analyzer-plugin/CMakeLists.txt +++ b/clang/examples/analyzer-plugin/CMakeLists.txt @@ -1,7 +1,7 @@ add_llvm_loadable_module(SampleAnalyzerPlugin MainCallChecker.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(SampleAnalyzerPlugin ${cmake_2_8_12_PRIVATE} + target_link_libraries(SampleAnalyzerPlugin PRIVATE clangAnalysis clangAST clangStaticAnalyzerCore |
