Use vcpkg for fast-float and spdlog

OPM · Aug 14, 2024 · f0e19b0 · f0e19b0
1 parent 3fdb30d
commit f0e19b0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "ThirdParty/vcpkg"]
 	path = ThirdParty/vcpkg
 	url = https://github.com/microsoft/vcpkg
-[submodule "ThirdParty/fast_float"]
-	path = ThirdParty/fast_float
-	url = https://github.com/fastfloat/fast_float
 [submodule "ThirdParty/custom-opm-common/opm-common"]
 	path = ThirdParty/custom-opm-common/opm-common
 	url = https://github.com/CeetronSolutions/opm-common
@@ -25,6 +22,3 @@
 [submodule "ThirdParty/qtadvanceddocking"]
 	path = ThirdParty/qtadvanceddocking
 	url = https://github.com/CeetronSolutions/qtadvanceddocking.git
-[submodule "ThirdParty/spdlog"]
-	path = ThirdParty/spdlog
-	url = https://github.com/gabime/spdlog.git
diff --git a/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp b/ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
@@ -19,7 +19,7 @@
 #include "RiaStdStringTools.h"
 #include "RiaLogging.h"
 
-#include "fast_float/include/fast_float/fast_float.h"
+#include "fast_float/fast_float.h"
 
 #include <QString>
 

diff --git a/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp b/ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp
@@ -20,7 +20,7 @@
 #include "RifEclipseKeywordContent.h"
 
 // Utility class for fast conversion from string to float
-#include "fast_float/include/fast_float/fast_float.h"
+#include "fast_float/fast_float.h"
 
 // Utility class memory mapping of files
 #include "mio/mio.hpp"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -633,11 +633,12 @@ set_property(
 add_subdirectory(ThirdParty/tomlplusplus)
 
 # ##############################################################################
-# spdlog
+# spdlog and fast_float
 # ##############################################################################
 
-add_subdirectory(ThirdParty/spdlog)
-list(APPEND THIRD_PARTY_LIBRARIES spdlog)
+find_package(FastFloat CONFIG REQUIRED)
+find_package(spdlog CONFIG REQUIRED)
+list(APPEND THIRD_PARTY_LIBRARIES FastFloat::fast_float spdlog::spdlog)
 
 # ##############################################################################
 # Arrow

diff --git a/ThirdParty/fast_float b/ThirdParty/fast_float
diff --git a/ThirdParty/spdlog b/ThirdParty/spdlog
diff --git a/vcpkg.json b/vcpkg.json
@@ -5,6 +5,8 @@
     "boost-spirit",
     "eigen3",
     "grpc",
-    "type-lite"
+    "type-lite",
+    "fast-float",
+    "spdlog"
   ]
 }