Skip to content

Commit fe4ca43

Browse files
authored
Merge pull request #72 from jcarpent/devel
Do not build test by default
2 parents fb1bad0 + 99aa85c commit fe4ca43

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ INCLUDE(cmake/test.cmake)
1919
SET(PROJECT_NAME eigenpy)
2020
SET(PROJECT_DESCRIPTION "Wrapping Eigen3 -- numpy")
2121
SET(PROJECT_URL "http://github.com/stack-of-tasks/eigenpy")
22-
OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
2322

2423
# Disable -Werror on Unix for now.
2524
SET(CXX_DISABLE_WERROR True)
@@ -47,11 +46,17 @@ ELSE(WIN32)
4746
SET(LINK create_symlink)
4847
ENDIF(WIN32)
4948

50-
5149
# ----------------------------------------------------
5250
# --- OPTIONS ---------------------------------------
5351
# ----------------------------------------------------
54-
OPTION (BUILD_UNIT_TESTS "Build the unitary tests" ON)
52+
OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
53+
OPTION(BUILD_UNIT_TESTS "Build the unitary tests" OFF)
54+
55+
IF(BUILD_UNIT_TESTS)
56+
SET(DISABLE_TESTS OFF)
57+
ELSE(BUILD_UNIT_TESTS)
58+
SET(DISABLE_TESTS ON)
59+
ENDIF(BUILD_UNIT_TESTS)
5560

5661
FINDPYTHON()
5762

cmake

Submodule cmake updated 1 file

unittest/CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@
33
# Copyright (c) 2018-2019 INRIA
44
#
55

6+
67
MACRO(ADD_LIB_UNIT_TEST test PKGS)
8+
CREATE_CTEST_BUILD_TESTS_TARGET()
9+
710
IF (BUILD_UNIT_TESTS)
811
ADD_LIBRARY(${test} SHARED ${test})
912
ELSE (BUILD_UNIT_TESTS)
1013
ADD_LIBRARY(${test} SHARED EXCLUDE_FROM_ALL ${test})
1114
ENDIF (BUILD_UNIT_TESTS)
15+
1216
FOREACH(PKG ${PKGS})
1317
PKG_CONFIG_USE_DEPENDENCY(${test} ${PKG})
1418
ENDFOREACH(PKG)
19+
1520
TARGET_LINK_LIBRARIES(${test} ${PROJECT_NAME})
1621
TARGET_LINK_BOOST_PYTHON(${test})
1722
SET_TARGET_PROPERTIES(${test} PROPERTIES PREFIX "")
@@ -22,10 +27,12 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
2227
ENDIF(APPLE)
2328

2429
ADD_TEST(NAME ${test} COMMAND ${PYTHON_EXECUTABLE} -c "import ${test}")
25-
ADD_DEPENDENCIES(check ${test})
26-
ENDMACRO(ADD_LIB_UNIT_TEST)
2730

28-
ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
31+
ADD_DEPENDENCIES(build_tests ${test})
32+
IF(DISABLE_TESTS)
33+
SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS ctest_build_tests)
34+
ENDIF(DISABLE_TESTS)
35+
ENDMACRO(ADD_LIB_UNIT_TEST)
2936

3037
ADD_LIB_UNIT_TEST(matrix "eigen3")
3138
ADD_LIB_UNIT_TEST(geometry "eigen3")

0 commit comments

Comments
 (0)