matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed building on LLVM 12

Browse Source
This commit is contained in:
Bartek Kryza
2021-05-01 11:27:36 +02:00
parent c6acc7bf20
commit 68be22f9dd
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -18,9 +18,6 @@
# This Makefile is just a handy wrapper around cmake # This Makefile is just a handy wrapper around cmake
# #
# Specify preferred LLVM version for CMake
LLVM_VERSION ?= 11
.DEFAULT_GOAL := debug .DEFAULT_GOAL := debug
.PHONY: clean .PHONY: clean
@@ -30,14 +27,12 @@ clean:
debug/CMakeLists.txt: debug/CMakeLists.txt:
cmake -S . -B debug \ cmake -S . -B debug \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug
-DLIBCLANG_LLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config-${LLVM_VERSION}
release/CMakeLists.txt: release/CMakeLists.txt:
cmake -S . -B release \ cmake -S . -B release \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release
-DLIBCLANG_LLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config-${LLVM_VERSION}
debug: debug/CMakeLists.txt debug: debug/CMakeLists.txt
make -C debug -j make -C debug -j

2
cmake/FindLibClang.cmake
View File

@@ -57,7 +57,7 @@ if (NOT LIBCLANG_LLVM_CONFIG_EXECUTABLE)
find_program(LIBCLANG_LLVM_CONFIG_EXECUTABLE NAMES llvm-config PATHS "${BREW_LLVM_PATH}/bin") find_program(LIBCLANG_LLVM_CONFIG_EXECUTABLE NAMES llvm-config PATHS "${BREW_LLVM_PATH}/bin")
else () else ()
set(llvm_config_names llvm-config) 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}") list(APPEND llvm_config_names "llvm-config${major}" "llvm-config-${major}")
foreach(minor RANGE 9 0) foreach(minor RANGE 9 0)
list(APPEND llvm_config_names "llvm-config${major}${minor}" "llvm-config-${major}.${minor}" "llvm-config-mp-${major}.${minor}") list(APPEND llvm_config_names "llvm-config${major}${minor}" "llvm-config-${major}.${minor}" "llvm-config-mp-${major}.${minor}")

1
tests/t00003/t00003.cc
View File

@@ -1,4 +1,5 @@
#include <functional> #include <functional>
#include <string>
namespace clanguml { namespace clanguml {
namespace t00003 { namespace t00003 {