Updates

arbCoding · Jan 27, 2024 · 46b8918 · 46b8918
1 parent 089b803
commit 46b8918
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 53 deletions.
diff --git a/.github/workflows/cmake-windows-package.yml b/.github/workflows/cmake-windows-package.yml
@@ -12,19 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install Catch2 v3 from source
-        run: |
-          git clone https://github.com/catchorg/Catch2.git
-          cd Catch2
-          git checkout v3.5.2
-          cmake -Bbuild -S. -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Debug
-          cmake --build build/ --target install
-
       - name: Prep License File for Distribution
         run: cp LICENSE License.txt
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS="/EHsc"
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS="/O2 /EHsc"
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,21 +38,32 @@ FetchContent_Declare(xoshiro
   GIT_REPOSITORY https://github.com/Reputeless/Xoshiro-cpp
   GIT_TAG v1.1
   SYSTEM)
-FetchContent_MakeAvailable(xoshiro)
+if (WIN32)
+  # Windows
+  FetchContent_Declare(Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2
+    GIT_TAG v3.5.2
+    SYSTEM)
+  FetchContent_MakeAvailable(xoshiro Catch2)
+else()
+  # Unix & macOS
+  FetchContent_MakeAvailable(xoshiro)
+  # Provides location to search for Catch2 installation from source build
+  # build via:
+  # git clone https://github.com/catchorg/Catch2.git
+  # mkdir build && cd build
+  # cmake .. -DBUILD_TESTING=Off
+  # make && sudo make install
+  # Need to figure out how to get this working on Windows as well!
+  list(APPEND CMAKE_PREFIX_PATH
+    "/usr/local/lib64/cmake" # Linux
+    "/usr/local/lib/cmake" # macOS
+    "C:/Program Files (x86)/Catch2" # Windows
+  )
+endif()
+
 # Include Xoshiro since it doesn't have a CMakeLists.txt
 include_directories(SYSTEM ${xoshiro_SOURCE_DIR})
-# Provides location to search for Catch2 installation from source build
-# build via:
-# git clone https://github.com/catchorg/Catch2.git
-# mkdir build && cd build
-# cmake .. -DBUILD_TESTING=Off
-# make && sudo make install
-# Need to figure out how to get this working on Windows as well!
-list(APPEND CMAKE_PREFIX_PATH
-  "/usr/local/lib64/cmake" # Linux
-  "/usr/local/lib/cmake" # macOS
-  "C:/Program Files (x86)/Catch2" # Windows
-)
 find_package(Catch2 3 CONFIG REQUIRED)
 #==============================================================================
 # sac-format

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 #include "sac-format/sac_format.hpp"
 #include "sac-format/util.hpp"
 // Catch2 https://github.com/catchorg/Catch2/tree/v3.4.0

diff --git a/src/examples/list_sac.cpp b/src/examples/list_sac.cpp
@@ -1,4 +1,4 @@
-// Copyright 2023 Alexander R. Blanchette
+// Copyright 2023-2024 Alexander R. Blanchette
 
 // sac-format
 #include "sac-format/sac_format.hpp"

diff --git a/src/tests/binary_conversions.cpp b/src/tests/binary_conversions.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 // sac-format
 #include "sac-format/sac_format.hpp"
 #include "sac-format/util.hpp"

diff --git a/src/tests/constants.cpp b/src/tests/constants.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 // sac-format
 #include "sac-format/sac_format.hpp"
 // Standard Library

diff --git a/src/tests/datetime.cpp b/src/tests/datetime.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 // sac-format
 #include "sac-format/sac_format.hpp"
 #include "sac-format/util.hpp"

diff --git a/src/tests/geometry.cpp b/src/tests/geometry.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 // sac-format
 #include "sac-format/sac_format.hpp"
 #include "sac-format/util.hpp"

diff --git a/src/tests/trace.cpp b/src/tests/trace.cpp
@@ -1,10 +1,5 @@
 // Copyright 2023-2024 Alexander R. Blanchette
 
-// Required for Catch2 compatibility on Windows
-#if defined(_MSC_VER) || defined(__MINW32__)
-#define _ITERATOR_DEBUG_LEVEL 2
-#endif
-
 // sac-format
 #include "sac-format/sac_format.hpp"
 #include "sac-format/util.hpp"