updating fast_float to v6.0.0 from develop

3MFConsortium · Dec 18, 2023 · 79f67de · 79f67de
1 parent 2b44ccc
commit 79f67de
Show file tree

Hide file tree

Showing 17 changed files with 3,674 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,6 +115,15 @@ add_library(${PROJECT_NAME} SHARED ${SRCS_COMMON} ${HDRS_COMMON}
 )
 SOURCE_GROUP("Source Files\\Autogenerated" FILES ${ACT_GENERATED_SOURCE})
 
+
+file(GLOB
+    LIBS_INCLUDE
+    LIST_DIRECTORIES true
+    ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/*/Include
+)
+list(FILTER LIBS_INCLUDE EXCLUDE REGEX "zlib|libzip|libressl")
+target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})
+
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include/API)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include)
@@ -143,10 +152,6 @@ else()
     target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
 endif()
 
-
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/fast_float/include)
-
-
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
 # This makes sure symbols are exported
 target_compile_options(${PROJECT_NAME} PRIVATE "-D__LIB3MF_EXPORTS")

diff --git a/Include/Common/NMR_StringUtils.h b/Include/Common/NMR_StringUtils.h
@@ -37,7 +37,7 @@ and Exception-safe
 #include "Common/NMR_Types.h"
 #include "Common/NMR_Local.h"
 
-#include <fast_float/fast_float.h>
+#include <fast_float.h>
 
 #include <string>
 #include <string.h>