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

Improve CMake yaml-cpp-detection (#206)

Browse Source
This commit is contained in:
Bartek Kryza
2023-11-11 17:22:20 +01:00
parent 19233e3a62
commit 429e1c47a9
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -47,6 +47,9 @@ endif(APPLE)
option(LINK_LLVM_SHARED "Should LLVM be linked using shared libraries" ON) option(LINK_LLVM_SHARED "Should LLVM be linked using shared libraries" ON)
set(LLVM_VERSION CACHE STRING "Major LLVM version to use (e.g. 15)") set(LLVM_VERSION CACHE STRING "Major LLVM version to use (e.g. 15)")
set(LLVM_CONFIG_PATH CACHE STRING "Path to llvm-config binary") set(LLVM_CONFIG_PATH CACHE STRING "Path to llvm-config binary")
set(CMAKE_PREFIX CACHE STRING "Path to custom cmake modules")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_PREFIX}")
# #
# Setup version string # Setup version string
@@ -138,7 +141,7 @@ set(THIRDPARTY_HEADERS_DIR ${PROJECT_SOURCE_DIR}/thirdparty/)
# #
include_directories(${LLVM_INCLUDE_DIRS}) include_directories(${LLVM_INCLUDE_DIRS})
include_directories(${CLANG_UML_INSTALL_INCLUDE_DIR}) include_directories(${CLANG_UML_INSTALL_INCLUDE_DIR})
include_directories(${YAML_CPP_INCLUDE_DIRS}) include_directories(${YAML_CPP_INCLUDE_DIR})
include_directories(${UML_HEADERS_DIR}) include_directories(${UML_HEADERS_DIR})
include_directories(${THIRDPARTY_HEADERS_DIR}) include_directories(${THIRDPARTY_HEADERS_DIR})
include_directories(${PROJECT_SOURCE_DIR}/src/) include_directories(${PROJECT_SOURCE_DIR}/src/)

10
Makefile
View File

@@ -32,6 +32,7 @@ endif
LLVM_VERSION ?= LLVM_VERSION ?=
LLVM_CONFIG_PATH ?= LLVM_CONFIG_PATH ?=
CMAKE_PREFIX ?=
CMAKE_CXX_FLAGS ?= CMAKE_CXX_FLAGS ?=
CMAKE_EXE_LINKER_FLAGS ?= CMAKE_EXE_LINKER_FLAGS ?=
@@ -54,7 +55,8 @@ debug/CMakeLists.txt:
-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_VERSION=${LLVM_VERSION} \ -DLLVM_VERSION=${LLVM_VERSION} \
-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-DCMAKE_PREFIX=${CMAKE_PREFIX}
release/CMakeLists.txt: release/CMakeLists.txt:
cmake -S . -B release \ cmake -S . -B release \
@@ -64,7 +66,8 @@ release/CMakeLists.txt:
-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_VERSION=${LLVM_VERSION} \ -DLLVM_VERSION=${LLVM_VERSION} \
-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-DCMAKE_PREFIX=${CMAKE_PREFIX}
debug_tidy/CMakeLists.txt: debug_tidy/CMakeLists.txt:
cmake -S . -B debug_tidy \ cmake -S . -B debug_tidy \
@@ -75,7 +78,8 @@ debug_tidy/CMakeLists.txt:
-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_VERSION=${LLVM_VERSION} \ -DLLVM_VERSION=${LLVM_VERSION} \
-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
-DCMAKE_PREFIX=${CMAKE_PREFIX}
debug: debug/CMakeLists.txt debug: debug/CMakeLists.txt
echo "Using ${NUMPROC} cores" echo "Using ${NUMPROC} cores"

2
packaging/Makefile
View File

@@ -138,4 +138,4 @@ conda:
$(call subst_conda_meta_yaml,PKG_SOURCE,..\/_BUILD\/conda\/clang-uml-$(VERSION).tar.$(TAR_EXT),conda) $(call subst_conda_meta_yaml,PKG_SOURCE,..\/_BUILD\/conda\/clang-uml-$(VERSION).tar.$(TAR_EXT),conda)
$(call subst_conda_meta_yaml,GIT_COMMIT,${COMMIT},conda) $(call subst_conda_meta_yaml,GIT_COMMIT,${COMMIT},conda)
$(call subst_conda_meta_yaml,GIT_BRANCH,${BRANCH},conda) $(call subst_conda_meta_yaml,GIT_BRANCH,${BRANCH},conda)
conda build --user bkryza --token $(CONDA_TOKEN) ./conda conda build --user bkryza --token $(CONDA_TOKEN) --label clang-uml ./conda