Skip to content

Commit

Permalink
[cmake] Update submodule
Browse files Browse the repository at this point in the history
* Call project() directly
* Use BUILD_TESTING rather than DISABLE_TESTS
  • Loading branch information
gergondet committed Oct 10, 2019
1 parent 6e01aa7 commit 2b9f3e0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
20 changes: 9 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,24 @@

cmake_minimum_required(VERSION 3.1.3)

set(CMAKE_CXX_STANDARD 11)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

include(cmake/base.cmake)
include(cmake/cython/cython.cmake)
include(cmake/msvc-specific.cmake)

set(PROJECT_NAME mc_rbdyn_urdf)
set(PROJECT_DESCRIPTION "URDF parsing for the RBDyn library")
set(PROJECT_URL "https://github.com/jrl-umi3218/mc_rbdyn_urdf")
set(PROJECT_DEBUG_POSTFIX "_d")
set(PROJECT_VERSION 1.1.0)
set(PROJECT_USE_CMAKE_EXPORT TRUE)

include(cmake/base.cmake)
include(cmake/cython/cython.cmake)
include(cmake/msvc-specific.cmake)

set(DOXYGEN_USE_MATHJAX "YES")
set(CXX_DISABLE_WERROR True)
setup_project()
set(PROJECT_VERSION 1.1.0)

option(DISABLE_TESTS "Disable unit tests." OFF)
project(mc_rbdyn_urdf CXX)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)

Expand All @@ -47,13 +48,10 @@ endif()

add_subdirectory(src)

if(NOT ${DISABLE_TESTS})
if(${BUILD_TESTING})
add_subdirectory(tests)
endif()

if(${PYTHON_BINDING})
add_subdirectory(binding/python)
endif()

setup_project_finalize()
setup_project_package_finalize()
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ sudo apt-get install librbdyn-dev librbdyn-doc python-rbdyn python3-rbdyn
### Building

```sh
git clone --recursive https://github.com/jrl-umi3218/RBDyn
cd RBDyn
git clone --recursive https://github.com/jrl-umi3218/mc_rbydn_urdf
cd mc_rbydn_urdf
mkdir _build
cd _build
cmake [options] ..
Expand All @@ -51,4 +51,4 @@ By default, the build will use the `python` and `pip` command to install the bin
* `PYTHON_BINDING_FORCE_PYTHON2`: use `python2` and `pip2` instead of `python` and `pip`
* `PYTHON_BINDING_FORCE_PYTHON3`: use `python3` and `pip3` instead of `python` and `pip`
* `PYTHON_BINDING_BUILD_PYTHON2_AND_PYTHON2`: builds two sets of bindings one with `python2` and `pip2`, the other with `python3` and `pip3`
* `DISABLE_TESTS` Disable unit tests building (ON/OFF, default: OFF)
* `BUILD_TESTING` Enable unit tests building (ON/OFF, default: ON)

0 comments on commit 2b9f3e0

Please sign in to comment.