Not yet correct

jasp-stats · Dec 12, 2023 · b72edec · b72edec
1 parent 2f614a7
commit b72edec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Tools/CMake/Patch.cmake b/Tools/CMake/Patch.cmake
@@ -94,7 +94,8 @@ else()
 
        if((FILE MATCHES "R_X11.so")
              OR (FILE MATCHES "R_de.so")
-             OR (FILE MATCHES "opt/X11"))
+             OR (FILE MATCHES "opt/X11")
+             OR (FILE MATCHES "grDevices"))
             execute_process(
               # COMMAND_ECHO STDOUT
               ERROR_QUIET OUTPUT_QUIET
@@ -167,6 +168,15 @@ else()
                 "${FRAMEWORK_RESOURCES}/opt/X11/lib/libXau.6.dylib"
                 "${FILE}")
 
+            execute_process(
+              # COMMAND_ECHO STDOUT
+              ERROR_QUIET OUTPUT_QUIET
+              WORKING_DIRECTORY ${PATH}
+              COMMAND
+                install_name_tool -change "/opt/X11/lib/libxcb.1.dylib"
+                "${FRAMEWORK_RESOURCES}/opt/X11/lib/libxcb.1.dylib"
+                "${FILE}")
+
         endif()
 
 

diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
@@ -315,7 +315,7 @@ if(APPLE)
           # @todo, it's probably a good idea to unpack this and provide a tar.gz like the other version
           fetchcontent_declare(
             gfortran_dmg
-            URL "{GFORTRAN_REPOSITORY}gfortran-8.2-Mojave.dmg"
+            URL "${GFORTRAN_REPOSITORY}gfortran-8.2-Mojave.dmg"
             URL_HASH
               SHA256=81d379231ba5671a5ef1b7832531f53be5a1c651701a61d87e1d877c4f06d369
             DOWNLOAD_NO_EXTRACT ON