Enabled C++ 17 and std::filesystem on MacOS

cpvrlab · Jan 22, 2024 · 3ea67f4 · 3ea67f4
1 parent fabfbc5
commit 3ea67f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (APPLE)

diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -17,7 +17,7 @@ set(CMAKE_BUILD_PARALLEL_LEVEL 16)
 set(DEFAULT_PROJECT_OPTIONS
     DEBUG_POSTFIX             "-debug"
     RELEASE_POSTFIX           "-release"
-    CXX_STANDARD              14
+    CXX_STANDARD              17
     LINKER_LANGUAGE           "CXX"
     POSITION_INDEPENDENT_CODE ON
     CXX_VISIBILITY_PRESET     "hidden"

diff --git a/modules/utils/source/Utils.cpp b/modules/utils/source/Utils.cpp
@@ -39,10 +39,14 @@ namespace fs = std::experimental::filesystem;
 #elif defined(__APPLE__)
 #    if defined(TARGET_OS_IOS) && (TARGET_OS_IOS == 1)
 #        include "Utils_iOS.h"
+#        include <dirent.h>   //dirent
+#        include <sys/stat.h> //dirent
+#        include <unistd.h>   //getcwd
+#    else
+#        include <filesystem>
+#        define USE_STD_FILESYSTEM
+namespace fs = std::filesystem;
 #    endif
-#    include <dirent.h>
-#    include <sys/stat.h> //dirent
-#    include <unistd.h>   //getcwd
 #elif defined(ANDROID) || defined(ANDROID_NDK)
 #    include <android/log.h>
 #    include <dirent.h>