Skip to content

Commit 98059d7

Browse files
committed
Add runtime dependency
1 parent d498a7e commit 98059d7

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ doc:
8080
# $(MAKE) SANITIZER=$@
8181

8282
build:
83-
CC=$(CXX) cmake --fresh -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
83+
CC=$(CXX) cmake --fresh -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
8484
-D CMAKE_EXPORT_COMPILE_COMMANDS=1 \
85-
-D CMAKE_CXX_COMPILER=$(CXX) # XXX -D CMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
85+
-D CMAKE_CXX_COMPILER=$(CXX) -D CMAKE_CXX_STANDARD=23 # XXX -D CMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
8686
cmake --build $(BUILD)
8787

8888
test: build
@@ -92,10 +92,10 @@ install: test
9292
cmake --install $(BUILD) --prefix $(INSTALL_PREFIX)
9393

9494
release:
95-
cmake --workflow --preset $@ --fresh
95+
cmake --workflow --preset $(WORKFLOW)$@ --fresh
9696

9797
debug:
98-
cmake --workflow --preset $@ --fresh
98+
cmake --workflow --preset $(WORKFLOW)$@ --fresh
9999

100100
ce:
101101
@mkdir -p $(BUILD)
@@ -123,7 +123,7 @@ codespell:
123123
format: cmake-format clang-format
124124

125125
cmake-format:
126-
git ls-files ::*.cmake ::*CMakeLists.txt | xargs cmake-format -i
126+
git ls-files ::*.cmake ::*.cmake.in ::*CMakeLists.txt | xargs cmake-format -i
127127

128128
clang-format:
129129
git clang-format main

cmake/use-fetch-content.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,5 @@ function(BemanExemplar_provideDependency method package_name)
147147
endforeach()
148148
endfunction()
149149

150-
cmake_language(SET_DEPENDENCY_PROVIDER BemanExemplar_provideDependency SUPPORTED_METHODS FIND_PACKAGE)
150+
# FIXME: Sinnfrei!
151+
# cmake_language(SET_DEPENDENCY_PROVIDER BemanExemplar_provideDependency SUPPORTED_METHODS FIND_PACKAGE)

examples/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ if(PROJECT_IS_TOP_LEVEL)
2323
endif()
2424

2525
include(CMakePrintHelpers)
26-
cmake_print_variables(CMAKE_CXX_STANDARD PROJECT_NAME PROJECT_VERSION PROJECT_SOURCE_DIR)
26+
cmake_print_variables(CMAKE_CXX_STANDARD CMAKE_PROJECT_NAME CMAKE_PROJECT_VERSION CMAKE_SOURCE_DIR)
27+
cmake_print_variables(CMAKE_CXX_SCAN_FOR_MODULES PROJECT_NAME PROJECT_VERSION PROJECT_SOURCE_DIR)
2728

2829
set(EXAMPLES
2930
inspect

src/beman/execution/beman.execution-config.cmake.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
set(BEMAN_EXECUTION_VERSION @PROJECT_VERSION@)
22

3+
include(CMakeFindDependencyMacro)
4+
find_dependency(Threads)
5+
36
@PACKAGE_INIT@
47

58
include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)

0 commit comments

Comments
 (0)