File tree Expand file tree Collapse file tree 2 files changed +8
-9
lines changed
Expand file tree Collapse file tree 2 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,6 @@ INCLUDE(cmake/base.cmake)
1414INCLUDE (cmake/boost.cmake)
1515INCLUDE (cmake/python.cmake)
1616INCLUDE (cmake/ide.cmake)
17- INCLUDE (cmake/test .cmake)
1817
1918SET (PROJECT_NAME eigenpy)
2019SET (PROJECT_DESCRIPTION "Wrapping Eigen3 -- numpy" )
@@ -25,6 +24,7 @@ SET(CXX_DISABLE_WERROR True)
2524SET (CMAKE_VERBOSE_MAKEFILE True )
2625
2726SETUP_PROJECT()
27+ MESSAGE (STATUS "BUILD_TESTING=${BUILD_TESTING} " )
2828STRING (REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
2929
3030IF (APPLE )
@@ -53,9 +53,9 @@ OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
5353OPTION (BUILD_UNIT_TESTS "Build the unitary tests" OFF )
5454
5555IF (BUILD_UNIT_TESTS)
56- SET (DISABLE_TESTS OFF )
56+ SET (BUILD_TESTING ON )
5757ELSE (BUILD_UNIT_TESTS)
58- SET (DISABLE_TESTS ON )
58+ SET (BUILD_TESTING OFF )
5959ENDIF (BUILD_UNIT_TESTS)
6060
6161FINDPYTHON()
Original file line number Diff line number Diff line change 33# Copyright (c) 2018-2019 INRIA
44#
55
6-
76MACRO (ADD_LIB_UNIT_TEST test PKGS)
87 CREATE_CTEST_BUILD_TESTS_TARGET()
98
10- IF (BUILD_UNIT_TESTS)
9+ IF (BUILD_UNIT_TESTS)
1110 ADD_LIBRARY (${test} SHARED ${test} )
12- ELSE (BUILD_UNIT_TESTS)
11+ ELSE (BUILD_UNIT_TESTS)
1312 ADD_LIBRARY (${test} SHARED EXCLUDE_FROM_ALL ${test} )
14- ENDIF (BUILD_UNIT_TESTS)
13+ ENDIF (BUILD_UNIT_TESTS)
1514
1615 FOREACH (PKG ${PKGS} )
1716 PKG_CONFIG_USE_DEPENDENCY(${test} ${PKG} )
@@ -29,9 +28,9 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
2928 ADD_TEST (NAME ${test} COMMAND ${PYTHON_EXECUTABLE} -c "import ${test} " )
3029
3130 ADD_DEPENDENCIES (build_tests ${test} )
32- IF (DISABLE_TESTS )
31+ IF (NOT BUILD_UNIT_TESTS )
3332 SET_TESTS_PROPERTIES (${test} PROPERTIES DEPENDS ctest_build_tests)
34- ENDIF (DISABLE_TESTS )
33+ ENDIF (NOT BUILD_UNIT_TESTS )
3534ENDMACRO (ADD_LIB_UNIT_TEST)
3635
3736ADD_LIB_UNIT_TEST(matrix "eigen3" )
You can’t perform that action at this time.
0 commit comments