OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-28 01:41:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use vcpkg for fast-float and spdlog

Browse Source
This commit is contained in:
Magne Sjaastad 2024-08-14 13:31:12 +02:00
parent 3fdb30d1e9
commit f0e19b0fb5
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -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

2
ApplicationLibCode/Application/Tools/RiaStdStringTools.cpp
View File

@ -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>

2
ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp
View File

@ -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"

7
CMakeLists.txt
View File

@ -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

1
ThirdParty/fast_float vendored

@ -1 +0,0 @@
Subproject commit 052975dd5f8166d0f9e4a215fa75a349d5985b91

1
ThirdParty/spdlog vendored

@ -1 +0,0 @@
Subproject commit 8979f7fb2a119754e5fe7fe6d8155f67d934316a

4
vcpkg.json
View File

@ -5,6 +5,8 @@
"boost-spirit",
"eigen3",
"grpc",
"type-lite"
"type-lite",
"fast-float",
"spdlog"
]
}