Skip to content

Commit a3fab15

Browse files
committed
Quickfix
1 parent 74161e0 commit a3fab15

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ endif()
2222
include(GNUInstallDirs)
2323
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
2424

25-
if(NOT DEFINED CMAKE_CXX_STANDARD)
26-
set(CMAKE_CXX_STANDARD 23)
27-
endif()
28-
29-
if(NOT DEFINED CMAKE_PREFIX_PATH)
30-
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
31-
endif()
32-
3325
add_subdirectory(src/beman/execution26)
3426

3527
if(PROJECT_IS_TOP_LEVEL)

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"hidden": true,
2424
"cacheVariables": {
2525
"CMAKE_BUILD_TYPE": "Debug",
26-
"CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak -fsanitize=undefined"
26+
"CMAKE_CXX_FLAGS": "-fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined"
2727
},
2828
"condition": {
2929
"type": "notEquals",

etc/clang-flags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_guard(GLOBAL)
22

33
set(CMAKE_CXX_STANDARD 23)
44

5-
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wall -Wextra " CACHE STRING "CXX_FLAGS" FORCE)
5+
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wall -Wextra" CACHE STRING "CXX_FLAGS" FORCE)
66

77
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
88
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)

etc/gcc-flags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_guard(GLOBAL)
22

33
set(CMAKE_CXX_STANDARD 23)
44

5-
set(CMAKE_CXX_FLAGS "-std=c++23 -Wall -Wextra " CACHE STRING "CXX_FLAGS" FORCE)
5+
set(CMAKE_CXX_FLAGS "-std=c++23 -Wall -Wextra" CACHE STRING "CXX_FLAGS" FORCE)
66

77
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
88
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)

etc/gcc-toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_C_COMPILER gcc)
44
set(CMAKE_CXX_COMPILER g++)
55

66
set(CMAKE_CXX_FLAGS "-std=c++20 \
7-
-Wall -Wextra " CACHE STRING "CXX_FLAGS" FORCE
7+
-Wall -Wextra" CACHE STRING "CXX_FLAGS" FORCE
88
)
99

1010
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)

etc/llvm-master-toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(CMAKE_CXX_COMPILER ${LLVM_ROOT}/bin/clang++)
66
set(CMAKE_CXX_FLAGS
77
"-std=c++2a \
88
-Wall -Wextra \
9-
-stdlib=libc++ "
9+
-stdlib=libc++"
1010
CACHE STRING "CXX_FLAGS" FORCE
1111
)
1212

tests/beman/execution26/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ list(
9696

9797
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
9898

99+
if(NOT DEFINED CMAKE_CXX_STANDARD)
100+
set(CMAKE_CXX_STANDARD 23)
101+
endif()
102+
103+
if(NOT DEFINED CMAKE_PREFIX_PATH)
104+
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
105+
endif()
106+
99107
if(PROJECT_IS_TOP_LEVEL)
100108
enable_testing()
101109
find_package(beman_execution26 0.0.1 EXACT QUIET)
@@ -106,7 +114,6 @@ if(PROJECT_IS_TOP_LEVEL)
106114

107115
include(CMakePrintHelpers)
108116
cmake_print_variables(TARGET_ALIAS TARGET_LIBRARY TARGET_PREFIX PROJECT_SOURCE_DIR)
109-
# FIXME: include_directories(${PROJECT_SOURCE_DIR}/include)
110117
endif()
111118
endif()
112119

0 commit comments

Comments
 (0)