Fix docopt

They also got rid of the annoying difference where the Linux library was oddly named 'docopt_s' and the Windows library was the more sensible 'docopt'. So I can collapse my cmake file.

src/CMakeLists.txt

@@ -2,87 +2,44 @@ add_executable(initialize ${PROJECT_SOURCE_DIR}/src/initialize.cpp)
 
 # On macOS and Linux docopt builds an intermediate object, thus different targets than Windows See
 # https://github.com/microsoft/vcpkg/issues/8666
-if(WIN32)
-  target_link_libraries(
-    initialize
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-else()
-  target_link_libraries(
-    initialize
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt_s
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-endif()
+target_link_libraries(
+  initialize
+  PRIVATE project_options
+          project_warnings
+          date::date-tz
+          docopt
+          fmt::fmt-header-only
+          Eigen3::Eigen
+          spdlog::spdlog_header_only
+          TBB::tbb
+          CGAL::CGAL)
 target_compile_features(initialize PRIVATE cxx_std_20)
 
 add_executable(cdt-opt ${PROJECT_SOURCE_DIR}/src/cdt-opt.cpp)
-if(WIN32)
-  target_link_libraries(
-    cdt-opt
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-else()
-  target_link_libraries(
-    cdt-opt
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt_s
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-endif()
+target_link_libraries(
+  cdt-opt
+  PRIVATE project_options
+          project_warnings
+          date::date-tz
+          fmt::fmt-header-only
+          Eigen3::Eigen
+          spdlog::spdlog_header_only
+          TBB::tbb
+          CGAL::CGAL)
 target_compile_features(cdt-opt PRIVATE cxx_std_20)
 
 add_executable(cdt ${PROJECT_SOURCE_DIR}/src/cdt.cpp)
-if(WIN32)
-  target_link_libraries(
-    cdt
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-else()
-  target_link_libraries(
-    cdt
-    PRIVATE project_options
-            project_warnings
-            date::date-tz
-            docopt_s
-            fmt::fmt-header-only
-            Eigen3::Eigen
-            spdlog::spdlog_header_only
-            TBB::tbb
-            CGAL::CGAL)
-endif()
+target_link_libraries(
+  cdt
+  PRIVATE project_options
+          project_warnings
+          date::date-tz
+          docopt
+          fmt::fmt-header-only
+          Eigen3::Eigen
+          spdlog::spdlog_header_only
+          TBB::tbb
+          CGAL::CGAL)
 target_compile_features(cdt PRIVATE cxx_std_20)
 
 # Build cdt-viewer locally, but not in CI since QT takes more than an hour to build there
@@ -93,7 +50,7 @@ if(APPLE AND NOT ($ENV{CI}))
     PRIVATE project_options
             project_warnings
             date::date-tz
-            docopt_s
+            docopt
             fmt::fmt-header-only
             Eigen3::Eigen
             spdlog::spdlog_header_only

src/cdt.cpp

@@ -11,7 +11,7 @@
 /// https://github.com/ucdavis/CDT.
 
 #include <CGAL/Real_timer.h>
-#include <docopt.h>
+#include <docopt/docopt.h>
 
 #include <Metropolis.hpp>
 

src/initialize.cpp

@@ -8,7 +8,7 @@
 /// @brief Generates initial spacetimes
 /// @author Adam Getchell
 
-#include <docopt.h>
+#include <docopt/docopt.h>
 
 #include "Manifold.hpp"