From a84b9d6ec3a0127472bb74e5b11faff820f3a5aa Mon Sep 17 00:00:00 2001 From: vdaleke Date: Mon, 11 Nov 2024 15:06:40 +0300 Subject: [PATCH] Refactor .gitignore and fix macOS guide Apply sort to .gitignore. Add **/.DS_Store to .gitignore to improve compatibility with macOS. Add python3 to dependencies installation guide. Change SDK version from 15.0 to 15 due to new version release. --- .gitignore | 23 ++++++++++++----------- README.md | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 48b43026bb..d468d7a7fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,15 @@ -cmake-build-debug/ -build/ -Build/ -BUILD/ -bUILD/ -Datasets/ -.sconsign.dblite -lib/ +**/.DS_Store +**/myeasylog.log .csv .idea/ +.sconsign.dblite .vscode/ -**/myeasylog.log -dist -venv +BUILD/ +Build/ +Datasets/ +bUILD/ +build/ +cmake-build-debug/ +dist/ +lib/ +venv/ diff --git a/README.md b/README.md index a2a40c7909..3309cc3ac9 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ To use test datasets you will need: Run the following commands: ```sh -sudo apt install gcc g++ cmake libboost-all-dev git-lfs +sudo apt install gcc g++ cmake libboost-all-dev git-lfs python3 export CC=gcc export CXX=g++ ``` @@ -253,7 +253,7 @@ Follow the prompts to continue. To install GCC and CMake on macOS we recommend to use [Homebrew](https://brew.sh/) package manager. With Homebrew installed, run the following commands: ```sh -brew install gcc@14 cmake +brew install gcc@14 cmake python3 ``` After installation, check `cmake --version`. If command is not found, then you need to add to environment path to homebrew installed packages. To do this open `~/.zprofile` (for Zsh) or @@ -285,7 +285,7 @@ export CXX=g++-14 export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/ ``` The first two lines set GCC as the default compiler in CMake. The last export is also necessary due to issues with GCC 14 and -the last MacOSX15.0.sdk used by CMake by default, you can read more about this [here](https://gist.github.com/scivision/d69faebbc56da9714798087b56de925a) +the last macOS 15 SDK used by CMake by default, you can read more about this [here](https://gist.github.com/scivision/d69faebbc56da9714798087b56de925a) and [here](https://github.com/iains/gcc-14-branch/issues/11). ### Building the project