mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-30 17:10:19 -05:00
Use vcpkg for fast-float and spdlog
This commit is contained in:
1 parent
3fdb30d1e9
commit
f0e19b0fb5
7 files changed
+9
-14
No files matched your search
@@ -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
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
+4
-3
@@ -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
|
||||
|
||||
Vendored
-1
Submodule ThirdParty/fast_float deleted from 052975dd5f.
Vendored
-1
Submodule ThirdParty/spdlog deleted from 8979f7fb2a.
+3
-1
@@ -5,6 +5,8 @@
|
||||
"boost-spirit",
|
||||
"eigen3",
|
||||
"grpc",
|
||||
"type-lite"
|
||||
"type-lite",
|
||||
"fast-float",
|
||||
"spdlog"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user