From 249af03f605fbfd9af18b51bedc7d77befc91d2f Mon Sep 17 00:00:00 2001 From: vaclavt Date: Sat, 29 Jan 2022 15:33:47 +0100 Subject: [PATCH] install and build fixes --- .vscode/launch.json | 12 ++++++++++++ .vscode/settings.json | 6 ++++-- CMakeLists.txt | 2 +- utils/local_install.sh | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index f4a590a..35e024c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,6 +16,18 @@ "externalConsole": false, "MIMode": "gdb" }, + { + "name": "ml -f debug.lsp", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/ml", + "args": ["-f", "${workspaceFolder}/debug.lsp"], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "console": "externalTerminal", + "MIMode": "gdb" + }, { "name": "ml -d -f debug.lsp", "type": "cppdbg", diff --git a/.vscode/settings.json b/.vscode/settings.json index 9d0daf7..1694d81 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -73,6 +73,8 @@ "variant": "cpp", "__functional_base_03": "cpp", "charconv": "cpp", - "cinttypes": "cpp" - } + "cinttypes": "cpp", + "filesystem": "cpp" + }, + "cmake.configureOnOpen": true } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ce0faa..e72cb7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,4 +63,4 @@ INSTALL(DIRECTORY stdlib/ DESTINATION var/mlisp FILES_MATCHING PATTERN "*.lsp") INSTALL(DIRECTORY doc/ DESTINATION var/mlisp - FILES_MATCHING PATTERN "*.doc") + FILES_MATCHING PATTERN "*.md") diff --git a/utils/local_install.sh b/utils/local_install.sh index 450f2f5..3dc825f 100755 --- a/utils/local_install.sh +++ b/utils/local_install.sh @@ -1,6 +1,7 @@ #!/bin/sh echo "cleaning" +rm -f CMakeCache.txt cmake -DCMAKE_BUILD_TYPE=Release . cmake --build ./ --target clean -j 4 -- echo "building ml"