Support fetch of docopt.cpp

computationalgeography · Apr 23, 2024 · 14e4f13 · 14e4f13
1 parent 0145c87
commit 14e4f13
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -124,7 +124,7 @@ jobs:
                   ${{ matrix.compiler.cxx }} \
                   ${{ env.lue_source_directory }}/build_profile
 
-              LUE_CONAN_PACKAGES="docopt.cpp imgui" \
+              LUE_CONAN_PACKAGES="imgui" \
                   conan install ${{ env.lue_source_directory }} \
                     --profile:host=${{ env.lue_source_directory }}/host_profile \
                     --profile:build=${{ env.lue_source_directory }}/build_profile \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -140,7 +140,7 @@ jobs:
                   ${{ matrix.compiler.cxx }} \
                   ${{ env.lue_source_directory }}/build_profile
 
-              LUE_CONAN_PACKAGES="docopt.cpp glfw imgui nlohmann_json vulkan-headers vulkan-loader" \
+              LUE_CONAN_PACKAGES="glfw imgui vulkan-headers vulkan-loader" \
                   conan install ${{ env.lue_source_directory }} \
                       --profile:host=${{ env.lue_source_directory }}/host_profile \
                       --profile:build=${{ env.lue_source_directory }}/build_profile \

diff --git a/environment/cmake/LueConfiguration.cmake b/environment/cmake/LueConfiguration.cmake
@@ -571,21 +571,16 @@ endif()
 
 
 if(LUE_DOCOPT_REQUIRED)
-    find_package(docopt REQUIRED)
-
-    # FetchContent_Declare(docopt
-    #     GIT_REPOSITORY https://github.com/docopt/docopt.cpp.git
-    #     GIT_TAG 42ebcec9dc2c99a1b3a4542787572045763ad196  # 0.6.3
-    #     SYSTEM
-    #     FIND_PACKAGE_ARGS
-    # )
-    # FetchContent_MakeAvailable(docopt)
-
-    # The docopt package shipѕ with CMake scripts that define a target names docopt. The
-    # Conan docopt package defines a target named docopt_s instead...
-    if(TARGET docopt_s AND NOT TARGET docopt)
-        add_library(docopt ALIAS docopt_s)
-    endif()
+    FetchContent_Declare(docopt
+        GIT_REPOSITORY https://github.com/docopt/docopt.cpp.git
+        GIT_TAG 42ebcec9dc2c99a1b3a4542787572045763ad196  # 0.6.3
+        SYSTEM
+        FIND_PACKAGE_ARGS
+    )
+    FetchContent_MakeAvailable(docopt)
+
+    # The docopt package shipѕ with CMake scripts that define a target named docopt (shared
+    # library) and docopt_s (static library).
 endif()
 
 

diff --git a/source/data_model/utility/CMakeLists.txt b/source/data_model/utility/CMakeLists.txt
@@ -20,6 +20,6 @@ target_include_directories(lue_utility
 target_link_libraries(lue_utility
     PUBLIC
         lue::data_model
-        docopt
+        docopt_s
         nlohmann_json::nlohmann_json
 )
diff --git a/source/data_model/utility/include/lue/utility/command.hpp b/source/data_model/utility/include/lue/utility/command.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <docopt/docopt.h>
+#include <docopt.h>
 #include <exception>
 #include <functional>
 #include <map>