Skip to content

Commit

Permalink
add dyld fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
theAeon committed Feb 12, 2024
1 parent 08638cb commit a88a16b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
20 changes: 19 additions & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,25 @@
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "macos-clang-arm64"
},
{
"name": "rtools",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "",
"compilerPath": "C:\\rtools43\\x86_64-w64-mingw32.static.posix\\bin\\gcc",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "${default}",
"mergeConfigurations": true,
"configurationProvider": "ms-vscode.cmake-tools"
}
],
"version": 4
}
}
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@
"cmake.useProjectStatusView": true,
"cmake.ignoreCMakeListsMissing": false,
"cmake.platform": "",
"cmake.cmakePath": "C:\\Rtools43\\MINGW64\\bin\\cmake.exe",
"cmake.generator": "Ninja",
"cmake.cmakePath": "C:\\Rtools43\\x86_64-w64-mingw32.static.posix\\bin\\cmake.exe",
"cmake.generator": "Unix Makefiles",
"cmake.configureArgs": [
"-DCMAKE_MAKE_PROGRAM=C:\\Rtools43\\mingw64\\bin\\ninja.exe",
"-DR_EXECUTABLE=C:\\Program Files\\R\\R-4.3.1\\bin\\x64\\R.exe",
"-DCMAKE_MAKE_PROGRAM=C:\\Rtools43\\usr\\bin\\make.exe",
"-DR_EXECUTABLE=C:\\Program Files\\R\\R-4.3.2\\bin\\x64\\R.exe",
],
"terminal.integrated.env.windows": {},
"memory-view.showMemoryPanel": true,
"cmake.sourceDirectory": "E:/RcppPlanc/tools"
"cmake.sourceDirectory": "${workspaceFolder}\\tools"
}
1 change: 1 addition & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ if test -z "$CMAKE"; then CMAKE="`which cmake`"; fi
if test -z "$CMAKE"; then CMAKE=/Applications/CMake.app/Contents/bin/cmake; fi
if ! test -f "$CMAKE"; then echo "no ‘cmake’ command found"; exit 1; fi

export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib"
: ${R_HOME=`R RHOME`}
if test -z "${R_HOME}"; then
echo "could not determine R_HOME"
Expand Down
3 changes: 3 additions & 0 deletions src/cpm-package-lock.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# CPM Package Lock
# This file should be committed to version control

0 comments on commit a88a16b

Please sign in to comment.