Skip to content

Commit 48dcb8a

Browse files
committed
Quickfix for export cmake config set
1 parent 42a521e commit 48dcb8a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ EXAMPLE = beman.execution.examples.stop_token
4242

4343
################################################
4444
ifeq (${hostSystemName},Darwin)
45-
export LLVM_PREFIX:=$(shell brew --prefix llvm)
45+
export LLVM_PREFIX:=$(shell brew --prefix llvm)
4646
export LLVM_DIR:=$(shell realpath ${LLVM_PREFIX})
4747
export PATH:=${LLVM_DIR}/bin:${PATH}
4848

@@ -113,7 +113,7 @@ doc:
113113
build:
114114
cmake -G Ninja -S $(SOURCEDIR) -B $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
115115
-D CMAKE_EXPORT_COMPILE_COMMANDS=ON \
116-
-D CMAKE_SKIP_INSTALL_RULES=ON \
116+
-D CMAKE_SKIP_INSTALL_RULES=OFF \
117117
-D CMAKE_CXX_STANDARD=23 \
118118
-D CMAKE_CXX_EXTENSIONS=ON \
119119
-D CMAKE_CXX_STANDARD_REQUIRED=ON \

examples/modules.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
#ifdef BEMAN_HAS_IMPORT_STD
55
import std;
66
#else
7-
87
#include <version>
98
#include <iostream>
109
#include <string>
11-
1210
#endif
1311

1412
import beman_execution;
@@ -21,7 +19,9 @@ int main() {
2119
ex::then([](const auto& s1, const auto& s2) { return s1 + s2; }))
2220
.value_or(std::tuple(std::string("oops")));
2321
std::cout << "result='" << result << "'\n";
24-
#else
22+
#elif defined(BEMAN_HAS_IMPORT_STD)
2523
std::println("ex::version = {}", ex::version);
24+
#else
25+
std::cout << "ex::version = " << ex::version << "\n";
2626
#endif
2727
}

src/beman/execution/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ endif()
220220

221221
install(
222222
TARGETS ${TARGET_NAME}
223-
EXPORT ${TARGETS_EXPORT_NAME}1
223+
EXPORT ${TARGETS_EXPORT_NAME}
224224
ARCHIVE DESTINATION lib/$<CONFIG>
225225
FILE_SET ${TARGET_NAME}_public_headers
226226
FILE_SET ${TARGET_NAME}_detail_headers
@@ -231,7 +231,7 @@ install(
231231
)
232232

233233
install(
234-
EXPORT ${TARGETS_EXPORT_NAME}1
234+
EXPORT ${TARGETS_EXPORT_NAME}
235235
FILE ${TARGETS_EXPORT_NAME}.cmake
236236
DESTINATION "${INSTALL_CONFIGDIR}"
237237
NAMESPACE ${TARGET_NAMESPACE}::

0 commit comments

Comments
 (0)