From 68c3552f0885f714c582361ea24388baefb95611 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Tue, 15 Apr 2014 10:10:16 +0200 Subject: [PATCH] Renamed 'test' target to 'gtest" and added 'ctest'-target. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These targets are renamed because CTest automatically generates a target called ‚test‘ which cannot be modified. make gtest - runs the unit tests make ctest - runs upcoming executable tests --- scripts/cmake/test/Test.cmake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake index 1f011473dbf..cdc2d908d5d 100644 --- a/scripts/cmake/test/Test.cmake +++ b/scripts/cmake/test/Test.cmake @@ -15,3 +15,22 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake ) + +INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/Data.cmake) + +IF(CMAKE_CONFIGURATION_TYPES) + ADD_CUSTOM_TARGET( + ctest + COMMAND ${CMAKE_CTEST_COMMAND} + --force-new-ctest-process --output-on-failure + --build-config "$<CONFIGURATION>" + DEPENDS data + ) +ELSE() + ADD_CUSTOM_TARGET( + ctest + COMMAND ${CMAKE_CTEST_COMMAND} + --force-new-ctest-process --output-on-failure + DEPENDS data + ) +ENDIF() -- GitLab