From bf6f456fd64021e17acb9487ffcfb573b38a6a6d Mon Sep 17 00:00:00 2001 From: maleicacid <4982384+kazuki0824@users.noreply.github.com> Date: Sat, 6 Aug 2022 17:24:14 +0900 Subject: [PATCH] Update CMakeLists.txt Add checking the condiition where testing is really enabled or not --- hrpsys_tools/CMakeLists.txt | 8 ++++++-- openrtm_tools/CMakeLists.txt | 7 ++++--- rtmbuild/CMakeLists.txt | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hrpsys_tools/CMakeLists.txt b/hrpsys_tools/CMakeLists.txt index 79a094d09..efea831ba 100644 --- a/hrpsys_tools/CMakeLists.txt +++ b/hrpsys_tools/CMakeLists.txt @@ -135,5 +135,9 @@ install(DIRECTORY scripts DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SO ## Add folders to be run by python nosetests # catkin_add_nosetests(test) install(DIRECTORY test samples DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS) -add_rostest(test/test-hrpsys-config.test) -add_rostest(test/test-pa10.test) + +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-hrpsys-config.test) + add_rostest(test/test-pa10.test) +endif() + diff --git a/openrtm_tools/CMakeLists.txt b/openrtm_tools/CMakeLists.txt index 526baa7fa..ea4864a05 100644 --- a/openrtm_tools/CMakeLists.txt +++ b/openrtm_tools/CMakeLists.txt @@ -139,7 +139,8 @@ install(PROGRAMS scripts/rtmlaunch scripts/rtmtest DESTINATION ${CATKIN_GLOBAL_B ## Add folders to be run by python nosetests # catkin_add_nosetests(test) - -add_rostest(test/test-openrtm-tools.test) -add_rostest(test/test-rtmlaunch.test) +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-openrtm-tools.test) + add_rostest(test/test-rtmlaunch.test) +endif() diff --git a/rtmbuild/CMakeLists.txt b/rtmbuild/CMakeLists.txt index 89fa2c9b8..a9f050a15 100644 --- a/rtmbuild/CMakeLists.txt +++ b/rtmbuild/CMakeLists.txt @@ -20,5 +20,7 @@ install(DIRECTORY cmake scripts test USE_SOURCE_PERMISSIONS ) -add_rostest(test/test-compile-idl.test) +if(CATKIN_ENABLE_TESTING) + add_rostest(test/test-compile-idl.test) +endif()