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

Added LLVM_VERSION make option

Browse Source
This commit is contained in:
Bartek Kryza
2022-08-06 13:12:03 +02:00
parent 5cdbb364b0
commit 1844b992aa
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -22,10 +22,9 @@ set(UML_HEADERS_DIR ${PROJECT_SOURCE_DIR}/src/uml)
# #
# CMake build options # CMake build options
# #
option(LLVM_CONFIG_PATH "Path to custom llvm-config executable")
option(LINK_LLVM_SHARED "Should LLVM be linked using shared libraries or statically" ON) option(LINK_LLVM_SHARED "Should LLVM be linked using shared libraries or statically" ON)
option(GIT_VERSION "clang-uml version" "0.1.0") set(LLVM_VERSION CACHE STRING "Path to custom llvm-config executable")
set(GIT_VERSION "0.1.0" CACHE STRING "clang-uml version")
# #
# Setup LLVM # Setup LLVM
@@ -37,7 +36,7 @@ if(LLVM_PREFIX)
set(LLVM_CONFIG_BINARY ${LLVM_CONFIG_PATH}) set(LLVM_CONFIG_BINARY ${LLVM_CONFIG_PATH})
endif(LLVM_PREFIX) endif(LLVM_PREFIX)
find_package(LLVM CONFIG REQUIRED) find_package(LLVM ${LLVM_VERSION} CONFIG REQUIRED)
list(APPEND CMAKE_MODULE_PATH ${LLVM_DIR}) list(APPEND CMAKE_MODULE_PATH ${LLVM_DIR})
include(AddLLVM) include(AddLLVM)

7
Makefile
View File

@@ -23,6 +23,7 @@
NUMPROC ?= $(shell nproc) NUMPROC ?= $(shell nproc)
LLVM_CONFIG_PATH ?= LLVM_CONFIG_PATH ?=
LLVM_VERSION ?=
CMAKE_CXX_FLAGS ?= CMAKE_CXX_FLAGS ?=
CMAKE_EXE_LINKER_FLAGS ?= CMAKE_EXE_LINKER_FLAGS ?=
@@ -39,7 +40,8 @@ debug/CMakeLists.txt:
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) -DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) \
-DLLVM_VERSION=${LLVM_VERSION}
release/CMakeLists.txt: release/CMakeLists.txt:
cmake -S . -B release \ cmake -S . -B release \
@@ -48,7 +50,8 @@ release/CMakeLists.txt:
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) -DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) \
-DLLVM_VERSION=${LLVM_VERSION}
debug: debug/CMakeLists.txt debug: debug/CMakeLists.txt
echo "Using ${NUMPROC} cores" echo "Using ${NUMPROC} cores"