diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index c4c0a01..a0d59dd 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -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 -} +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index b486443..e5bfe2a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" } diff --git a/configure b/configure index 6edcd0a..5f86cb3 100755 --- a/configure +++ b/configure @@ -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" diff --git a/src/cpm-package-lock.cmake b/src/cpm-package-lock.cmake new file mode 100644 index 0000000..67eeaba --- /dev/null +++ b/src/cpm-package-lock.cmake @@ -0,0 +1,3 @@ +# CPM Package Lock +# This file should be committed to version control +