diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b170746..ba0e080e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,9 @@ endif(APPLE) 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_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 @@ -138,7 +141,7 @@ set(THIRDPARTY_HEADERS_DIR ${PROJECT_SOURCE_DIR}/thirdparty/) # include_directories(${LLVM_INCLUDE_DIRS}) 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(${THIRDPARTY_HEADERS_DIR}) include_directories(${PROJECT_SOURCE_DIR}/src/) diff --git a/Makefile b/Makefile index 39675248..9d55dd42 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ endif LLVM_VERSION ?= LLVM_CONFIG_PATH ?= +CMAKE_PREFIX ?= CMAKE_CXX_FLAGS ?= CMAKE_EXE_LINKER_FLAGS ?= @@ -54,7 +55,8 @@ debug/CMakeLists.txt: -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DLLVM_VERSION=${LLVM_VERSION} \ - -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} + -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \ + -DCMAKE_PREFIX=${CMAKE_PREFIX} release/CMakeLists.txt: cmake -S . -B release \ @@ -64,7 +66,8 @@ release/CMakeLists.txt: -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DLLVM_VERSION=${LLVM_VERSION} \ - -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} + -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \ + -DCMAKE_PREFIX=${CMAKE_PREFIX} debug_tidy/CMakeLists.txt: cmake -S . -B debug_tidy \ @@ -75,7 +78,8 @@ debug_tidy/CMakeLists.txt: -DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \ -DLLVM_VERSION=${LLVM_VERSION} \ - -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} + -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \ + -DCMAKE_PREFIX=${CMAKE_PREFIX} debug: debug/CMakeLists.txt echo "Using ${NUMPROC} cores" diff --git a/packaging/Makefile b/packaging/Makefile index 45c852ad..40a689ad 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -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,GIT_COMMIT,${COMMIT},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