From 620a045824b41871e6ac87d611e3ae7136bf3f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Fri, 24 Sep 2021 20:36:09 +0200 Subject: [PATCH 1/2] Add MACOS install instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- .github/ci/packages.brew | 4 ++++ tutorials/installation.md | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 .github/ci/packages.brew diff --git a/.github/ci/packages.brew b/.github/ci/packages.brew new file mode 100644 index 000000000..4158b5766 --- /dev/null +++ b/.github/ci/packages.brew @@ -0,0 +1,4 @@ +eigen +ignition-cmake2 +ruby +swig diff --git a/tutorials/installation.md b/tutorials/installation.md index 323638601..99f377ccc 100644 --- a/tutorials/installation.md +++ b/tutorials/installation.md @@ -32,6 +32,22 @@ sudo apt install libignition-math<#>-dev Be sure to replace `<#>` with a number value, such as 1 or 2, depending on which version you need. +### macOS + +On macOS, add OSRF packages: + ``` + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + brew tap osrf/simulation + ``` + +Install Ignition GUI: + ``` + brew install ignition-math<#> + ``` + +Be sure to replace `<#>` with a number value, such as 1 or 2, depending on +which version you need. + ## Windows Install [Conda package management system](https://docs.conda.io/projects/conda/en/latest/user-guide/install/download.html). @@ -126,6 +142,34 @@ The optional Eigen component of Ignition Math requires: sudo make install ``` +### macOS + +1. Clone the repository + ``` + git clone https://github.com/ignitionrobotics/ign-math -b ign-math<#> + ``` + Be sure to replace `<#>` with a number value, such as 1 or 2, depending on + which version you need. + +2. Install dependencies + ``` + brew install $(sort -u $(find . -iname 'packages.brew') | tr '\n' ' ') + ``` + +3. Configure and build + ``` + cd ign-math + mkdir build + cd build + cmake .. + make + ``` + +4. Optionally, install + ``` + sudo make install + ``` + ### Windows 1. Navigate to `condabin` if necessary to use the `conda` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of `condabin` in Anaconda Prompt, `where conda`). @@ -229,4 +273,3 @@ The interfaces and Ruby test codes are in the `src` folder. To use a C++ class i ``` ctest -R Ruby_TEST.rb ``` - From 6ff4622b07ac6908888136372b7e6b81841c42e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Herna=CC=81ndez?= Date: Fri, 24 Sep 2021 22:19:58 +0200 Subject: [PATCH 2/2] Improve instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- .github/ci/packages.brew | 4 ---- tutorials/installation.md | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 .github/ci/packages.brew diff --git a/.github/ci/packages.brew b/.github/ci/packages.brew deleted file mode 100644 index 4158b5766..000000000 --- a/.github/ci/packages.brew +++ /dev/null @@ -1,4 +0,0 @@ -eigen -ignition-cmake2 -ruby -swig diff --git a/tutorials/installation.md b/tutorials/installation.md index 99f377ccc..6eab5e021 100644 --- a/tutorials/installation.md +++ b/tutorials/installation.md @@ -40,7 +40,7 @@ On macOS, add OSRF packages: brew tap osrf/simulation ``` -Install Ignition GUI: +Install Ignition Math: ``` brew install ignition-math<#> ``` @@ -153,8 +153,10 @@ The optional Eigen component of Ignition Math requires: 2. Install dependencies ``` - brew install $(sort -u $(find . -iname 'packages.brew') | tr '\n' ' ') + brew install --only-dependencies ignition-math<#> ``` + Be sure to replace `<#>` with a number value, such as 1 or 2, depending on + which version you need. 3. Configure and build ```