From 2692d2dc3d8c34b0f405d2d1986f3ba5d0a29a8e Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 28 Aug 2019 21:50:19 +0200 Subject: [PATCH] [CMake] Fixed wrong number of ctest threads when $NUM_THREADS is not defined. --- scripts/cmake/test/Test.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake index 22ea870e81f..7d1a8166334 100644 --- a/scripts/cmake/test/Test.cmake +++ b/scripts/cmake/test/Test.cmake @@ -38,12 +38,11 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/MeshTest.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/OgsTest.cmake) +set(NUM_CTEST_PROCESSORS 3) if(DEFINED ENV{CTEST_NUM_THREADS}) set(NUM_CTEST_PROCESSORS $ENV{CTEST_NUM_THREADS}) elseif(DEFINED ENV{NUM_THREADS}) set(NUM_CTEST_PROCESSORS $ENV{NUM_THREADS}) -else() - set(NUM_CTEST_PROCESSORS 3) endif() if(DEFINED ENV{CTEST_LARGE_NUM_THREADS}) -- GitLab