feat: update to boost 1.82 (#106)

Co-authored-by: Vishwa Shah <[email protected]>
open-space-collective · Apr 21, 2023 · debefb1 · debefb1
1 parent 3af388c
commit debefb1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -228,12 +228,12 @@ ENDFOREACH ()
 
 ## Dependencies
 
-### Boost [1.69.0]
+### Boost [1.82.0]
 
 SET (Boost_USE_STATIC_LIBS ON)
 SET (Boost_USE_MULTITHREADED ON)
 
-FIND_PACKAGE ("Boost" "1.69" REQUIRED COMPONENTS "system" "filesystem" "regex" "log")
+FIND_PACKAGE ("Boost" "1.82" REQUIRED COMPONENTS "system" "filesystem" "regex" "log")
 
 IF (NOT Boost_FOUND)
     MESSAGE (SEND_ERROR "[Boost] not found.")
@@ -298,7 +298,7 @@ IF (BUILD_SHARED_LIBRARY)
 
     TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "stdc++")
     TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "pthread")
-    TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "Boost::date_time" "Boost::filesystem" "Boost::log")
+    TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "Boost::filesystem" "Boost::log")
     TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "yaml-cpp")
 
     SET_TARGET_PROPERTIES ( ${SHARED_LIBRARY_TARGET} PROPERTIES
@@ -329,7 +329,7 @@ IF (BUILD_STATIC_LIBRARY)
     TARGET_INCLUDE_DIRECTORIES (${STATIC_LIBRARY_TARGET} PUBLIC "${PROJECT_SOURCE_DIR}/include/")
 
     TARGET_LINK_LIBRARIES (${STATIC_LIBRARY_TARGET} "pthread")
-    TARGET_LINK_LIBRARIES (${STATIC_LIBRARY_TARGET} "Boost::date_time" "Boost::filesystem" "Boost::log")
+    TARGET_LINK_LIBRARIES (${STATIC_LIBRARY_TARGET} "Boost::filesystem" "Boost::log")
     TARGET_LINK_LIBRARIES (${STATIC_LIBRARY_TARGET} "yaml-cpp")
 
     SET_TARGET_PROPERTIES (${STATIC_LIBRARY_TARGET} PROPERTIES VERSION ${PROJECT_VERSION_STRING} OUTPUT_NAME ${SHARED_LIBRARY_NAME} CLEAN_DIRECT_OUTPUT 1 INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/")
@@ -357,7 +357,7 @@ IF (BUILD_UTILITY)
     TARGET_INCLUDE_DIRECTORIES (${UTILITY_TARGET} PUBLIC "${PROJECT_SOURCE_DIR}/include/")
 
     TARGET_LINK_LIBRARIES (${UTILITY_TARGET} "pthread")
-    TARGET_LINK_LIBRARIES (${UTILITY_TARGET} "Boost::date_time" "Boost::filesystem" "Boost::log")
+    TARGET_LINK_LIBRARIES (${UTILITY_TARGET} "Boost::filesystem" "Boost::log")
     TARGET_LINK_LIBRARIES (${UTILITY_TARGET} ${SHARED_LIBRARY_TARGET})
 
     SET_TARGET_PROPERTIES (${UTILITY_TARGET} PROPERTIES VERSION ${PROJECT_VERSION_STRING} OUTPUT_NAME ${SHARED_LIBRARY_NAME} CLEAN_DIRECT_OUTPUT 1 INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/")

diff --git a/src/OpenSpaceToolkit/Core/FileSystem/Directory.cpp b/src/OpenSpaceToolkit/Core/FileSystem/Directory.cpp
@@ -300,7 +300,7 @@ void                            Directory::create                           (
             directoryPathString += "/" ;
         }
 
-        if (!boost::filesystem::create_directories(boost::filesystem::path(directoryPathString).branch_path()))
+        if (!boost::filesystem::create_directories(boost::filesystem::path(directoryPathString).parent_path()))
         {
             throw ostk::core::error::RuntimeError("Cannot create directory [{}].", this->toString()) ;
         }

diff --git a/test/OpenSpaceToolkit/Core/FileSystem/Path.test.cpp b/test/OpenSpaceToolkit/Core/FileSystem/Path.test.cpp
@@ -420,7 +420,7 @@ TEST (OpenSpaceToolkit_Core_FileSystem_Path, GetNormalizedPath)
         EXPECT_EQ(Path::Parse("/"), Path::Parse("/").getNormalizedPath()) ;
         EXPECT_EQ(Path::Parse("/abc"), Path::Parse("/abc").getNormalizedPath()) ;
         EXPECT_EQ(Path::Parse("/app"), Path::Parse("/app").getNormalizedPath()) ;
-        EXPECT_EQ(Path::Parse("/app"), Path::Parse("/app/").getNormalizedPath()) ;
+        EXPECT_EQ(Path::Parse("/app/"), Path::Parse("/app/").getNormalizedPath()) ;
         EXPECT_EQ(Path::Parse("/app/build"), Path::Parse("/app/build").getNormalizedPath()) ;
         EXPECT_EQ(Path::Parse("/app/build/Makefile"), Path::Parse("/app/build/Makefile").getNormalizedPath()) ;