diff --git a/Meta/Lagom/ClangPlugins/CMakeLists.txt b/Meta/Lagom/ClangPlugins/CMakeLists.txt index 3fb6efb02e..73fe656d2b 100644 --- a/Meta/Lagom/ClangPlugins/CMakeLists.txt +++ b/Meta/Lagom/ClangPlugins/CMakeLists.txt @@ -9,7 +9,7 @@ function(clang_plugin target_name) add_custom_target(${target_name}Target DEPENDS ${target_name}) - set_property(GLOBAL APPEND PROPERTY CLANG_PLUGINS_ALL_COMPILE_OPTIONS -fplugin=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/lib${target_name}.so) + set_property(GLOBAL APPEND PROPERTY CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS -fplugin=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/lib${target_name}.so) add_lagom_library_install_rules(${target_name}) endfunction() diff --git a/Tests/ClangPlugins/CMakeLists.txt b/Tests/ClangPlugins/CMakeLists.txt index 21dc2f745c..4d1a68d11a 100644 --- a/Tests/ClangPlugins/CMakeLists.txt +++ b/Tests/ClangPlugins/CMakeLists.txt @@ -3,8 +3,8 @@ include(AddLLVM) find_package(Python3 REQUIRED COMPONENTS Interpreter) -get_property(CLANG_PLUGINS_ALL_COMPILE_OPTIONS GLOBAL PROPERTY CLANG_PLUGINS_ALL_COMPILE_OPTIONS) -list(APPEND CLANG_PLUGINS_ALL_COMPILE_OPTIONS -std=c++23 -Wno-user-defined-literals -Wno-literal-range) +get_property(CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS GLOBAL PROPERTY CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS) +list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS -std=c++23 -Wno-user-defined-literals -Wno-literal-range) get_property(CLANG_PLUGINS_INCLUDE_DIRECTORIES TARGET AK PROPERTY INCLUDE_DIRECTORIES) list(APPEND CLANG_PLUGINS_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) diff --git a/Tests/ClangPlugins/lit.site.cfg.py.in b/Tests/ClangPlugins/lit.site.cfg.py.in index f2b4ea638d..44ebc0cef3 100644 --- a/Tests/ClangPlugins/lit.site.cfg.py.in +++ b/Tests/ClangPlugins/lit.site.cfg.py.in @@ -18,7 +18,7 @@ config.enable_shared = @ENABLE_SHARED@ config.host_arch = "@HOST_ARCH@" config.python_executable = "@Python3_EXECUTABLE@" # config.has_plugins = @CLANG_PLUGIN_SUPPORT@ -config.plugin_opts = "@CLANG_PLUGINS_ALL_COMPILE_OPTIONS@" +config.plugin_opts = "@CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS@" config.plugin_includes = "@CLANG_PLUGINS_INCLUDE_DIRECTORIES@" import lit.llvm