adding fast_float as dependency lib

3MFConsortium · Dec 15, 2023 · de54f00 · de54f00
1 parent c1dc55c
commit de54f00
Show file tree

Hide file tree

Showing 20 changed files with 3,637 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./build/Test_CPP_Bindings_filtered.info
-          fail_ci_if_error: false # optional (default = false)
+          fail_ci_if_error: true # optional (default = false)
           verbose: true # optional (default = false)
 
   build-windows-release:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,18 +115,20 @@ 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")
+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)
-target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})
+
 
 if (USE_INCLUDED_LIBZIP)
     target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/libzip/Include)
@@ -179,7 +181,7 @@ else()
 endif()
 
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/fast_float/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/fast_float/Include)
 
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )

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>

diff --git a/Libraries/cpp-base64/cpp-base64_V2.rc.08.txt b/Libraries/cpp-base64/cpp-base64_V2.rc.08.txt
@@ -1 +1 @@
-V2.rc.08
+"V2.rc.08"