move cpp20 things to cpp20 subdir

johnkerl · Nov 21, 2024 · 30c4346 · 30c4346
1 parent 7f551b2
commit 30c4346
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,14 +12,12 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ Standard")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(spffl)
-add_subdirectory(spffl20)
 add_subdirectory(lib)
 add_subdirectory(cli)
 
 enable_testing()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 add_subdirectory(test)
-add_subdirectory(test20)
 
 # ----------------------------------------------------------------
 install(

diff --git a/cpp20/CMakeLists.txt b/cpp20/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required (VERSION 3.24)
+
+project(spffl20)
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ Standard")
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_subdirectory(spffl)
+#add_subdirectory(lib)
+#add_subdirectory(cli)
+
+enable_testing()
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
+add_subdirectory(test)
+
+# ----------------------------------------------------------------
+#install(
+#  DIRECTORY "spffl/" # The trailing slash is important so "spffl" isn't a part of the install path
+#  DESTINATION "include/spffl"
+#  FILES_MATCHING PATTERN "*.h"
+#)
+#install(TARGETS spffl DESTINATION lib)
+#install(TARGETS spiff DESTINATION bin)
diff --git a/spffl20/CMakeLists.txt → cpp20/spffl/CMakeLists.txt b/spffl20/CMakeLists.txt → cpp20/spffl/CMakeLists.txt
diff --git a/spffl20/README.md → cpp20/spffl/README.md b/spffl20/README.md → cpp20/spffl/README.md
diff --git a/spffl20/mod/CMakeLists.txt → cpp20/spffl/mod/CMakeLists.txt b/spffl20/mod/CMakeLists.txt → cpp20/spffl/mod/CMakeLists.txt
diff --git a/spffl20/mod/foo.cpp → cpp20/spffl/mod/foo.cpp b/spffl20/mod/foo.cpp → cpp20/spffl/mod/foo.cpp
diff --git a/spffl20/mod/foo.h → cpp20/spffl/mod/foo.h b/spffl20/mod/foo.h → cpp20/spffl/mod/foo.h
diff --git a/test20/CMakeLists.txt → cpp20/test/CMakeLists.txt b/test20/CMakeLists.txt → cpp20/test/CMakeLists.txt
diff --git a/cpp20/test/README.md b/cpp20/test/README.md
@@ -0,0 +1 @@
+This is Catch2 for `cpp20/spffl`.
diff --git a/test20/mod/CMakeLists.txt → cpp20/test/mod/CMakeLists.txt b/test20/mod/CMakeLists.txt → cpp20/test/mod/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(test_base)
+project(test_mod)
 
 # ----------------------------------------------------------------
 # catch2 has a set-but-unused-variable warning as of MacOS 13.3.

diff --git a/cpp20/test/mod/test_mod.cpp b/cpp20/test/mod/test_mod.cpp
@@ -0,0 +1,7 @@
+#include <catch2/catch_test_macros.hpp>
+
+#include "spffl/mod/foo.h"
+
+TEST_CASE("spffl::mod::foo") {
+  CHECK(foo(2,3) == 5);
+}
diff --git a/test20/README.md b/test20/README.md
diff --git a/test20/mod/test_mod.cpp b/test20/mod/test_mod.cpp