diff --git a/Makefile b/Makefile index d639d0a6..86cd9445 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,6 @@ # This Makefile is just a handy wrapper around cmake # -# Specify preferred LLVM version for CMake -LLVM_VERSION ?= 11 - .DEFAULT_GOAL := debug .PHONY: clean @@ -30,14 +27,12 @@ clean: debug/CMakeLists.txt: cmake -S . -B debug \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_BUILD_TYPE=Debug \ - -DLIBCLANG_LLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config-${LLVM_VERSION} + -DCMAKE_BUILD_TYPE=Debug release/CMakeLists.txt: cmake -S . -B release \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBCLANG_LLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config-${LLVM_VERSION} + -DCMAKE_BUILD_TYPE=Release debug: debug/CMakeLists.txt make -C debug -j diff --git a/cmake/FindLibClang.cmake b/cmake/FindLibClang.cmake index 46efae30..670c8616 100644 --- a/cmake/FindLibClang.cmake +++ b/cmake/FindLibClang.cmake @@ -57,7 +57,7 @@ if (NOT LIBCLANG_LLVM_CONFIG_EXECUTABLE) find_program(LIBCLANG_LLVM_CONFIG_EXECUTABLE NAMES llvm-config PATHS "${BREW_LLVM_PATH}/bin") else () set(llvm_config_names llvm-config) - foreach(major RANGE 11 3) + foreach(major RANGE 12 3) list(APPEND llvm_config_names "llvm-config${major}" "llvm-config-${major}") foreach(minor RANGE 9 0) list(APPEND llvm_config_names "llvm-config${major}${minor}" "llvm-config-${major}.${minor}" "llvm-config-mp-${major}.${minor}") diff --git a/tests/t00003/t00003.cc b/tests/t00003/t00003.cc index bc9b3f6e..b63fd7bb 100644 --- a/tests/t00003/t00003.cc +++ b/tests/t00003/t00003.cc @@ -1,4 +1,5 @@ #include +#include namespace clanguml { namespace t00003 {