From 6eddce402d7329b89727298502149d84717e2b5e Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:35:43 +0200 Subject: [PATCH 1/6] Set version in cmake --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96a4160..d4f61b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,16 +21,18 @@ # FOR A PARTICULAR PURPOSE. See GNU General Public License for details. # cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0048 NEW) -cmake_policy(SET CMP0079 NEW) +cmake_policy(SET CMP0048 NEW) -option(BUILD_EXAMPLE "Build demo" ON) +option(BUILD_EXAMPLE "Build demo" ON) +set(GK_VERSION_MAJOR 3) +set(GK_VERSION_MINOR 0) +set(GK_VERSION_PATCH 0) project(lib_opengjk_ce LANGUAGES C - VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} - DESCRIPTION "openGJK library" - HOMEPAGE_URL "https://mattiamontanari.com/opengjk" + DESCRIPTION "openGJK library community edition (CE)" + HOMEPAGE_URL "www.mattiamontanari.com/opengjk/" + VERSION ${GK_VERSION_MAJOR}.${GK_VERSION_MINOR}.${GK_VERSION_PATCH} ) set( C_STANDARD 99) From 9851fe1cfea2cf225f9923abc200174ee82221b4 Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:39:00 +0200 Subject: [PATCH 2/6] Remove old pipeline --- .github/workflows/ccpp.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/ccpp.yml diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml deleted file mode 100644 index c8844d9..0000000 --- a/.github/workflows/ccpp.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: C/C++ CI - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install python moduels - run: sudo apt update && sudo apt install -y libeigen3-dev python3-setuptools && pip3 install pybind11 pytest numpy scipy cython - - name: Compile Bybind - run: export CPATH=/usr/include/eigen3 && cd examples/python && source build.sh - - name: Test Bybind - run: | - cd examples/python - python3 -m pytest -s -v test.py - - name: Run cython - run: | - cd examples/cython - python3 setup.py build_ext --inplace && python3 -m pytest -s -v test.py From f7f243ec04dd14edb72ee7bc3d1bf90f4ca98967 Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:43:12 +0200 Subject: [PATCH 3/6] Fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c231037..1b6acc7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ followed by these commands: cmake -E make_directory build cmake -E chdir build cmake -DRUN_UNITESTS=ON -DCMAKE_BUILD_TYPE=Release .. cmake --build build -cmake -E chdir build/src/examples/c ./example_lib_opengjk_ce +cmake -E chdir build/examples/c ./example_lib_opengjk_ce cmake -E chdir "build/test" ctest --build-config Release ``` From ccafeac1d2b43f9a34ecbb019561a8c7dbfe02c3 Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:43:45 +0200 Subject: [PATCH 4/6] Fix typo in readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1b6acc7..3225252 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,9 @@ cmake -E chdir "build/test" ctest --build-config Release ``` If you get no errors, the successfull output is: + > `Distance between bodies 3.653650`. + However, if you do get an error - any error - please file a bug! Support requests are welcome too. # Beyond getting started From 3cbb2e2214eafdb2e4f91b8c2d098b0b54e0e4a4 Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:44:38 +0200 Subject: [PATCH 5/6] address in gitclone --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3225252..3ca6e55 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ If you have some basic tools installed (git, compiler and cmake) clone this repo: ``` -git clone +git clone https://github.com/MattiaMontanari/openGJK/tree/ce ``` followed by these commands: From 8034efb402dca8b71fc640cf522065a3feb46153 Mon Sep 17 00:00:00 2001 From: Mattia Montanari Date: Sat, 9 Jul 2022 23:45:07 +0200 Subject: [PATCH 6/6] address in gitclone --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ca6e55..6e712f6 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ If you have some basic tools installed (git, compiler and cmake) clone this repo: ``` -git clone https://github.com/MattiaMontanari/openGJK/tree/ce +git clone https://github.com/MattiaMontanari/openGJK.git ``` followed by these commands: