Skip to content

Deprecate BUILD_UNIT_TESTS #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 19, 2019
Merged

Deprecate BUILD_UNIT_TESTS #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
102bf6f
Default BUILD_TESTING to OFF
gabrielebndn Dec 18, 2019
1c84523
Deprecate BUILD_UNIT_TESTS and remove its usage
gabrielebndn Dec 18, 2019
48694fc
Revert "Default BUILD_TESTING to OFF"
gabrielebndn Dec 19, 2019
0fac89e
[BUILD_UNIT_TESTS] Better deprecation message
gabrielebndn Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ ENDIF(WIN32)
# --- OPTIONS ---------------------------------------
# ----------------------------------------------------
OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
OPTION(BUILD_UNIT_TESTS "Build the unitary tests" OFF)

IF(BUILD_UNIT_TESTS)
SET(BUILD_TESTING ON)
ELSE(BUILD_UNIT_TESTS)
SET(BUILD_TESTING OFF)
ENDIF(BUILD_UNIT_TESTS)
IF(DEFINED BUILD_UNIT_TESTS)
MESSAGE(AUTHOR_WARNING "BUILD_UNIT_TESTS is deprecated. Use BUILD_TESTING instead.\
If you are manually building Pinocchio from source in an existing build folder,\
we suggest that you delete your build folder and make a new one.")
SET(BUILD_TESTING ${BUILD_UNIT_TESTS})
ENDIF(DEFINED BUILD_UNIT_TESTS)

FINDPYTHON()
FIND_NUMPY()
Expand Down
10 changes: 5 additions & 5 deletions unittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
MACRO(ADD_LIB_UNIT_TEST test PKGS)
CREATE_CTEST_BUILD_TESTS_TARGET()

IF(BUILD_UNIT_TESTS)
IF(BUILD_TESTING)
ADD_LIBRARY(${test} SHARED ${test})
ELSE(BUILD_UNIT_TESTS)
ELSE(BUILD_TESTING)
ADD_LIBRARY(${test} SHARED EXCLUDE_FROM_ALL ${test})
ENDIF(BUILD_UNIT_TESTS)
ENDIF(BUILD_TESTING)

FOREACH(PKG ${PKGS})
PKG_CONFIG_USE_DEPENDENCY(${test} ${PKG})
Expand All @@ -24,9 +24,9 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
ADD_TEST(NAME ${test} COMMAND ${PYTHON_EXECUTABLE} -c "import ${test}")

ADD_DEPENDENCIES(build_tests ${test})
IF(NOT BUILD_UNIT_TESTS)
IF(NOT BUILD_TESTING)
SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS ctest_build_tests)
ENDIF(NOT BUILD_UNIT_TESTS)
ENDIF(NOT BUILD_TESTING)
ENDMACRO(ADD_LIB_UNIT_TEST)

ADD_LIB_UNIT_TEST(matrix "eigen3")
Expand Down