Skip to content

Commit 0e6bb8b

Browse files
ClausKleinClausKlein
committed
Fix install release presets
1 parent 48dcb8a commit 0e6bb8b

File tree

4 files changed

+119
-104
lines changed

4 files changed

+119
-104
lines changed

‎Makefile‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ endif
3131
LDFLAGS ?=
3232
SAN_FLAGS ?=
3333
CXX_FLAGS ?= -g
34-
SANITIZER := release
34+
# Note: disabled while working on CXX_MODULES! CK
35+
# XXX: NO! SANITIZER := release
3536
SANITIZER ?= RelWithDebInfo
3637
SOURCEDIR = $(CURDIR)
3738
BUILDROOT = build
@@ -94,26 +95,40 @@ ifeq ($(SANITIZER),lsan)
9495
LDFLAGS = $(SAN_FLAGS)
9596
endif
9697

98+
.PHONY: help FIXME TODO
99+
help:
100+
@echo "Use one of the folling targets:"
101+
@echo ""
102+
@echo "build -> use CXX_MODULES if possible"
103+
@echo "test -> build and test "
104+
@echo "debug -> preset with 'import std;'"
105+
@echo "release -> preset with 'import std;'"
106+
@echo "doc"
107+
@echo "clean"
108+
@echo "format"
109+
@echo "distclean"
110+
97111
# TODO: beman.execution.examples.modules
98112
FIXME: beman.execution.execution-module.test beman.execution.stop-token-module.test
99113

114+
# Note: disabled while working on CXX_MODULES! CK
100115
# XXX: NO! $(SANITIZER): test
101-
102-
all: $(SANITIZERS)
116+
# XXX all: $(SANITIZERS)
103117

104118
run: test
105119
./$(BUILD)/examples/$(EXAMPLE)
106120

107121
doc:
108122
doxygen docs/Doxyfile
109123

124+
# Note: disabled while working on CXX_MODULES! CK
110125
# $(SANITIZERS):
111126
# $(MAKE) SANITIZER=$@
112127

113128
build:
114129
cmake -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
115130
-D CMAKE_EXPORT_COMPILE_COMMANDS=ON \
116-
-D CMAKE_SKIP_INSTALL_RULES=OFF \
131+
-D CMAKE_SKIP_INSTALL_RULES=ON \
117132
-D CMAKE_CXX_STANDARD=23 \
118133
-D CMAKE_CXX_EXTENSIONS=ON \
119134
-D CMAKE_CXX_STANDARD_REQUIRED=ON \

‎cmake/presets/CMakeDarwinPresets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"hidden": true,
2323
"cacheVariables": {
2424
"CMAKE_CXX_STDLIB_MODULES_JSON": "$env{CMAKE_CXX_STDLIB_MODULES_JSON}",
25-
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
25+
"CMAKE_BUILD_TYPE": "Release"
2626
},
2727
"condition": {
2828
"type": "equals",

‎cmake/presets/CMakeLinuxPresets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"hidden": true,
2323
"cacheVariables": {
2424
"CMAKE_CXX_STDLIB_MODULES_JSON": "$env{CMAKE_CXX_STDLIB_MODULES_JSON}",
25-
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
25+
"CMAKE_BUILD_TYPE": "Release"
2626
},
2727
"condition": {
2828
"type": "equals",

‎tests/beman/execution/CMakeLists.txt‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -16,106 +16,106 @@ if(BEMAN_USE_MODULES)
1616
execution-module.test # execution-module.test.cpp
1717
stop-token-module.test # stop-token-module.test.cpp
1818
)
19+
else()
20+
list(
21+
APPEND execution_tests
22+
issue-174.test
23+
issue-186.test
24+
exec-scope-counting.test
25+
exec-spawn.test
26+
exec-stop-when.test
27+
exec-prop.test
28+
exec-scope-simple-counting.test
29+
exec-spawn-future.test
30+
exec-scope-concepts.test
31+
issue-144.test
32+
exec-on.test
33+
notify.test
34+
exec-awaitable.test
35+
allocator-requirements-general.test
36+
exec-connect.test
37+
exec-continues-on.test
38+
exec-domain-default.test
39+
exec-fwd-env.test
40+
exec-general.test
41+
exec-get-allocator.test
42+
exec-get-compl-sched.test
43+
exec-get-delegation-scheduler.test
44+
exec-get-domain.test
45+
exec-get-env.test
46+
exec-get-scheduler.test
47+
exec-get-stop-token.test
48+
exec-getcomplsigs.test
49+
exec-into-variant.test
50+
exec-just.test
51+
exec-let.test
52+
exec-opstate-start.test
53+
exec-opstate.test
54+
exec-read-env.test
55+
exec-recv-concepts.test
56+
exec-recv.test
57+
exec-run-loop-general.test
58+
exec-run-loop-types.test
59+
exec-sched.test
60+
exec-schedule-from.test
61+
exec-schedule.test
62+
exec-set-error.test
63+
exec-set-stopped.test
64+
exec-set-value.test
65+
exec-snd-apply.test
66+
exec-snd-concepts.test
67+
exec-snd-expos.test
68+
exec-snd-transform.test
69+
exec-starts-on.test
70+
exec-split.test
71+
exec-sync-wait.test
72+
exec-then.test
73+
exec-utils-cmplsigs.test
74+
exec-when-all.test
75+
exec-with-awaitable-senders.test
76+
execution-queryable-concept.test
77+
exec-bulk.test
78+
execution-syn.test
79+
forward-like.test
80+
function-objects.test
81+
functional-syn.test
82+
meta-combine.test
83+
meta-contains.test
84+
meta-filter.test
85+
meta-prepend.test
86+
meta-transform.test
87+
meta-unique.test
88+
stopcallback-cons.test
89+
stopcallback-general.test
90+
stopcallback-inplace-cons.test
91+
stopcallback-inplace-general.test
92+
stopcallback-inplace.test
93+
stopcallback.test
94+
stopsource-cons.test
95+
stopsource-general.test
96+
stopsource-inplace-cons.test
97+
stopsource-inplace-general.test
98+
stopsource-inplace-mem.test
99+
stopsource-inplace.test
100+
stopsource-mem.test
101+
stopsource.test
102+
stoptoken-concepts.test
103+
stoptoken-general.test
104+
stoptoken-inplace-general.test
105+
stoptoken-inplace-members.test
106+
stoptoken-inplace.test
107+
stoptoken-mem.test
108+
stoptoken-never-general.test
109+
stoptoken-never.test
110+
stoptoken.test
111+
thread-stoptoken-intro.test
112+
thread-stoptoken-syn.compile.test
113+
thread-stoptoken.test
114+
thread.test
115+
utilities.test
116+
)
19117
endif()
20118

21-
list(
22-
APPEND execution_tests
23-
issue-174.test
24-
issue-186.test
25-
exec-scope-counting.test
26-
exec-spawn.test
27-
exec-stop-when.test
28-
exec-prop.test
29-
exec-scope-simple-counting.test
30-
exec-spawn-future.test
31-
exec-scope-concepts.test
32-
issue-144.test
33-
exec-on.test
34-
notify.test
35-
exec-awaitable.test
36-
allocator-requirements-general.test
37-
exec-connect.test
38-
exec-continues-on.test
39-
exec-domain-default.test
40-
exec-fwd-env.test
41-
exec-general.test
42-
exec-get-allocator.test
43-
exec-get-compl-sched.test
44-
exec-get-delegation-scheduler.test
45-
exec-get-domain.test
46-
exec-get-env.test
47-
exec-get-scheduler.test
48-
exec-get-stop-token.test
49-
exec-getcomplsigs.test
50-
exec-into-variant.test
51-
exec-just.test
52-
exec-let.test
53-
exec-opstate-start.test
54-
exec-opstate.test
55-
exec-read-env.test
56-
exec-recv-concepts.test
57-
exec-recv.test
58-
exec-run-loop-general.test
59-
exec-run-loop-types.test
60-
exec-sched.test
61-
exec-schedule-from.test
62-
exec-schedule.test
63-
exec-set-error.test
64-
exec-set-stopped.test
65-
exec-set-value.test
66-
exec-snd-apply.test
67-
exec-snd-concepts.test
68-
exec-snd-expos.test
69-
exec-snd-transform.test
70-
exec-starts-on.test
71-
exec-split.test
72-
exec-sync-wait.test
73-
exec-then.test
74-
exec-utils-cmplsigs.test
75-
exec-when-all.test
76-
exec-with-awaitable-senders.test
77-
execution-queryable-concept.test
78-
exec-bulk.test
79-
execution-syn.test
80-
forward-like.test
81-
function-objects.test
82-
functional-syn.test
83-
meta-combine.test
84-
meta-contains.test
85-
meta-filter.test
86-
meta-prepend.test
87-
meta-transform.test
88-
meta-unique.test
89-
stopcallback-cons.test
90-
stopcallback-general.test
91-
stopcallback-inplace-cons.test
92-
stopcallback-inplace-general.test
93-
stopcallback-inplace.test
94-
stopcallback.test
95-
stopsource-cons.test
96-
stopsource-general.test
97-
stopsource-inplace-cons.test
98-
stopsource-inplace-general.test
99-
stopsource-inplace-mem.test
100-
stopsource-inplace.test
101-
stopsource-mem.test
102-
stopsource.test
103-
stoptoken-concepts.test
104-
stoptoken-general.test
105-
stoptoken-inplace-general.test
106-
stoptoken-inplace-members.test
107-
stoptoken-inplace.test
108-
stoptoken-mem.test
109-
stoptoken-never-general.test
110-
stoptoken-never.test
111-
stoptoken.test
112-
thread-stoptoken-intro.test
113-
thread-stoptoken-syn.compile.test
114-
thread-stoptoken.test
115-
thread.test
116-
utilities.test
117-
)
118-
119119
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
120120

121121
foreach(test ${execution_tests})

0 commit comments

Comments
 (0)