Trying gtk+3 and a xcode save version

revbayes · Apr 12, 2018 · 324c845 · 324c845
1 parent 15edab0
commit 324c845
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/projects/cmake/regenerate.sh b/projects/cmake/regenerate.sh
@@ -235,7 +235,8 @@ echo '
 
 # Use the package PkgConfig to detect GTK+ headers/library files
 FIND_PACKAGE(PkgConfig REQUIRED)
-PKG_CHECK_MODULES(GTK REQUIRED gtk+-2.0)
+#PKG_CHECK_MODULES(GTK REQUIRED gtk+-2.0)
+PKG_CHECK_MODULES(GTK REQUIRED gtk+-3.0)
 
 # Setup CMake to use GTK+, tell the compiler where to look for headers
 # and to the linker where to look for libraries

diff --git a/src/core/utils/RbFileManager.cpp b/src/core/utils/RbFileManager.cpp
@@ -3,17 +3,15 @@
 #include "RbSettings.h"
 #include "StringUtilities.h"
 
-#include <boost/filesystem.hpp>
-
 #include <iostream>
 #include <string>
 #include <cstring>
 #include <sys/stat.h>
 #include <cstdlib>
 
-//#ifndef RB_XCODE
-//#include <boost/filesystem.hpp>
-//#endif
+#ifndef RB_XCODE
+#include <boost/filesystem.hpp>
+#endif
 
 //#ifdef WIN32
 //#	include <dirent.h>
@@ -669,12 +667,20 @@ bool RbFileManager::parsePathFileNames(const std::string &input_string)
     StringUtilities::replaceSubstring(name,"/","\\");
 #   endif
 
+#    ifdef RB_XCODE
+    //    std::filesystem::path path(winPathString); // Construct the path from a string.
+    if ( name.size() > 0 && name[0] != '/' )
+    {
+        name = getCurrentDirectory() + path_separator + input_string;
+    }
+#    else
     boost::filesystem::path tmp_file = boost::filesystem::path(name);
-//    std::filesystem::path path(winPathString); // Construct the path from a string.
+    //    std::filesystem::path path(winPathString); // Construct the path from a string.
     if ( tmp_file.is_absolute() == false )
     {
         name = getCurrentDirectory() + path_separator + input_string;
     }
+#    endif
 
 
     // check if the path is a good one