diff options
17 files changed, 48 insertions, 69 deletions
diff --git a/clang/lib/Analysis/CMakeLists.txt b/clang/lib/Analysis/CMakeLists.txt index 940a3dfe6f6..92717143467 100644 --- a/clang/lib/Analysis/CMakeLists.txt +++ b/clang/lib/Analysis/CMakeLists.txt @@ -34,3 +34,5 @@ add_clang_library(clangAnalysis clangBasic clangLex ) + +add_subdirectory(plugins) diff --git a/clang/lib/Analysis/plugins/CMakeLists.txt b/clang/lib/Analysis/plugins/CMakeLists.txt new file mode 100644 index 00000000000..f7dbc936952 --- /dev/null +++ b/clang/lib/Analysis/plugins/CMakeLists.txt @@ -0,0 +1,5 @@ +if(LLVM_ENABLE_PLUGINS) + add_subdirectory(SampleAnalyzer) + add_subdirectory(CheckerDependencyHandling) + add_subdirectory(CheckerOptionHandling) +endif() diff --git a/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt index 80e2cdbd3a2..0a8ff48755f 100644 --- a/clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt +++ b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt @@ -1,11 +1,10 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerDependencyHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerDependencyHandlingAnalyzerPlugin MODULE CheckerDependencyHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() +target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp index be8e1200d0b..be8e1200d0b 100644 --- a/clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp +++ b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp diff --git a/clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports index 8d9ff882cfb..8d9ff882cfb 100644 --- a/clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports +++ b/clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports diff --git a/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt b/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt index 6a1d5e85279..6e289933c2d 100644 --- a/clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt +++ b/clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt @@ -1,11 +1,10 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerOptionHandlingAnalyzerPlugin.exports) add_llvm_library(CheckerOptionHandlingAnalyzerPlugin MODULE CheckerOptionHandling.cpp PLUGIN_TOOL clang) -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() +target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp b/clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp index 77de3630ae7..77de3630ae7 100644 --- a/clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp +++ b/clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp diff --git a/clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports b/clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports index 8d9ff882cfb..8d9ff882cfb 100644 --- a/clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports +++ b/clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports diff --git a/clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt b/clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt new file mode 100644 index 00000000000..639a97f2531 --- /dev/null +++ b/clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt @@ -0,0 +1,10 @@ +set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports) +add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang) + +target_link_libraries(SampleAnalyzerPlugin PRIVATE + clangAnalysis + clangAST + clangStaticAnalyzerCore + clangStaticAnalyzerFrontend + LLVMSupport + ) diff --git a/clang/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp b/clang/lib/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp index 8bd4085108e..8bd4085108e 100644 --- a/clang/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp +++ b/clang/lib/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp diff --git a/clang/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports b/clang/lib/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports index 8d9ff882cfb..8d9ff882cfb 100644 --- a/clang/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports +++ b/clang/lib/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports diff --git a/clang/test/Analysis/lit.local.cfg b/clang/test/Analysis/lit.local.cfg index b77cae8eceb..84f7569152c 100644 --- a/clang/test/Analysis/lit.local.cfg +++ b/clang/test/Analysis/lit.local.cfg @@ -18,7 +18,5 @@ config.substitutions.append(('%diff_plist', config.substitutions.append(('%diff_sarif', '''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\."''')) -config.excludes.add('plugins') - if not config.root.clang_staticanalyzer: config.unsupported = True diff --git a/clang/test/Analysis/plugins/CMakeLists.txt b/clang/test/Analysis/plugins/CMakeLists.txt deleted file mode 100644 index 8d4333f99a4..00000000000 --- a/clang/test/Analysis/plugins/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_subdirectory(SampleAnalyzer) -add_subdirectory(CheckerDependencyHandling) -add_subdirectory(CheckerOptionHandling) - -set(CLANG_ANALYZER_PLUGIN_DEPS - SampleAnalyzerPlugin - CheckerDependencyHandlingAnalyzerPlugin - CheckerOptionHandlingAnalyzerPlugin - ) - -add_custom_target(clang-analyzer-plugin - DEPENDS ${CLANG_ANALYZER_PLUGIN_DEPS}) diff --git a/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt b/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt deleted file mode 100644 index 7c7b2aec198..00000000000 --- a/clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports) -add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang) - -if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) - target_link_libraries(SampleAnalyzerPlugin PRIVATE - clangAnalysis - clangAST - clangStaticAnalyzerCore - LLVMSupport - ) -endif() diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 339f637847d..32fe571afaa 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -126,27 +126,13 @@ if( NOT CLANG_BUILT_STANDALONE ) endif() if (CLANG_ENABLE_STATIC_ANALYZER) - add_subdirectory(Analysis/plugins) - list(APPEND CLANG_TEST_DEPS clang-analyzer-plugin) - - # check-all would launch those tests via check-clang. - set(EXCLUDE_FROM_ALL ON) - - add_lit_testsuite(check-clang-analyzer "Running the Clang analyzer tests" - ${CMAKE_CURRENT_BINARY_DIR}/Analysis - PARAMS ${ANALYZER_TEST_PARAMS} - DEPENDS ${CLANG_TEST_DEPS}) - set_target_properties(check-clang-analyzer PROPERTIES FOLDER "Clang tests") - - if (LLVM_WITH_Z3) - add_lit_testsuite(check-clang-analyzer-z3 "Running the Clang analyzer tests, using Z3 as a solver" - ${CMAKE_CURRENT_BINARY_DIR}/Analysis - PARAMS ${ANALYZER_TEST_PARAMS_Z3} - DEPENDS ${CLANG_TEST_DEPS}) - set_target_properties(check-clang-analyzer-z3 PROPERTIES FOLDER "Clang tests") + if (LLVM_ENABLE_PLUGINS) + set(CLANG_ANALYZER_PLUGIN_DEPS + SampleAnalyzerPlugin + CheckerDependencyHandlingAnalyzerPlugin + CheckerOptionHandlingAnalyzerPlugin + ) endif() - - set(EXCLUDE_FROM_ALL OFF) endif() add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS}) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 895f9ab7189..6ca7b6da6dc 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -672,6 +672,17 @@ set(TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}") message(STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE}") message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}") +if(WIN32 OR CYGWIN) + if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) + set(LLVM_ENABLE_PLUGINS_default ON) + else() + set(LLVM_ENABLE_PLUGINS_default OFF) + endif() +else() + set(LLVM_ENABLE_PLUGINS_default ON) +endif() +option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default}) + include(HandleLLVMOptions) # Verify that we can find a Python 2 interpreter. Python 3 is unsupported. diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index cb9a01e1d39..8e7c93c9a93 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -912,14 +912,6 @@ if(LLVM_LINK_LLVM_DYLIB AND LLVM_EXPORT_SYMBOLS_FOR_PLUGINS) message(FATAL_ERROR "LLVM_LINK_LLVM_DYLIB not compatible with LLVM_EXPORT_SYMBOLS_FOR_PLUGINS") endif() -# Plugin support -# FIXME: Make this configurable. -if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB) - set(LLVM_ENABLE_PLUGINS ON) -else() - set(LLVM_ENABLE_PLUGINS OFF) -endif() - # By default we should enable LLVM_ENABLE_IDE only for multi-configuration # generators. This option disables optional build system features that make IDEs # less usable. |
