Move away from deprecated CLI dependency (#798)

* Move away from deprecated CLI dependency * Cheat and add cli search * Update cmake to new CLI11
disorderedmaterials · Sep 13, 2021 · a764164 · a764164
1 parent 4cbee9a
commit a764164
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -308,7 +308,7 @@ target_link_libraries(
          ${MODULENOGUI_LINK_LIBS} ${NO_WHOLE_ARCHIVE_FLAG}
   PRIVATE # External libs
           antlr4-runtime ${EXTRA_LINK_LIBS} ${THREADING_LINK_LIBS}
-  INTERFACE CONAN_PKG::fmt CONAN_PKG::CLI11
+  INTERFACE CONAN_PKG::fmt CONAN_PKG::cli11
 )
 
 # Build GUI target executables
@@ -340,6 +340,6 @@ if(GUI)
             ${FREETYPE_LIBRARIES}
             ${EXTRA_LINK_LIBS}
             ${THREADING_LINK_LIBS}
-    INTERFACE CONAN_PKG::fmt CONAN_PKG::CLI11 CONAN_PKG::pugixml
+    INTERFACE CONAN_PKG::fmt CONAN_PKG::cli11 CONAN_PKG::pugixml
   )
 endif(GUI)
diff --git a/conanfile.txt b/conanfile.txt
@@ -1,5 +1,5 @@
 [requires]
-CLI11/1.9.1@cliutils/stable
+cli11/1.9.1
 fmt/7.0.3
 gtest/1.10.0
 pugixml/1.11

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
@@ -28,4 +28,4 @@ add_library(
 )
 
 include_directories(main PRIVATE ${PROJECT_SOURCE_DIR}/src)
-target_link_libraries(main PRIVATE CONAN_PKG::fmt CONAN_PKG::CLI11)
+target_link_libraries(main PRIVATE CONAN_PKG::fmt CONAN_PKG::cli11)
diff --git a/unit/CMakeLists.txt b/unit/CMakeLists.txt
@@ -26,7 +26,7 @@ foreach(SRCFILE ${tests_SRC})
            # Module 'nogui' libs
            ${MODULENOGUI_LINK_LIBS} ${NO_WHOLE_ARCHIVE_FLAG}
     PRIVATE antlr4-runtime ${EXTRA_LINK_LIBS} GTest::gtest_main
-    INTERFACE CONAN_PKG::fmt CONAN_PKG::CLI11
+    INTERFACE CONAN_PKG::fmt CONAN_PKG::cli11
   )
   add_test(NAME ${NAME} COMMAND ${NAME})