File tree Expand file tree Collapse file tree 7 files changed +13
-14
lines changed
Expand file tree Collapse file tree 7 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -22,14 +22,6 @@ endif()
2222include (GNUInstallDirs)
2323set(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-
3325add_subdirectory(src/beman/execution26)
3426
3527if(PROJECT_IS_TOP_LEVEL)
Original file line number Diff line number Diff line change 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" ,
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ include_guard(GLOBAL)
22
33set (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
77set (CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
88set (CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ include_guard(GLOBAL)
22
33set (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
77set (CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
88set (CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set(CMAKE_C_COMPILER gcc)
44set (CMAKE_CXX_COMPILER g++)
55
66set (CMAKE_CXX_FLAGS "-std=c++20 \
7- -Wall -Wextra " CACHE STRING "CXX_FLAGS" FORCE
7+ -Wall -Wextra" CACHE STRING "CXX_FLAGS" FORCE
88)
99
1010set (CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ set(CMAKE_CXX_COMPILER ${LLVM_ROOT}/bin/clang++)
66set (CMAKE_CXX_FLAGS
77 "-std=c++2a \
88 -Wall -Wextra \
9- -stdlib=libc++ "
9+ -stdlib=libc++"
1010 CACHE STRING "CXX_FLAGS" FORCE
1111)
1212
Original file line number Diff line number Diff line change 9696
9797include_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+
99107if (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 ()
111118endif ()
112119
You can’t perform that action at this time.
0 commit comments