From 1918ab666998ffad54deb11977e684714d57b2d1 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Fri, 15 Dec 2023 10:56:31 +0100 Subject: [PATCH] Always attempt to find Nanos6 and NODES Causes the packages to always appear as found or not found in the summary of cmake. Otherwise they were only checked if the compiler supports the -fompss2 flag. --- test/rt/nanos6/CMakeLists.txt | 3 ++- test/rt/nodes/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/rt/nanos6/CMakeLists.txt b/test/rt/nanos6/CMakeLists.txt index 987a971..5893c52 100644 --- a/test/rt/nanos6/CMakeLists.txt +++ b/test/rt/nanos6/CMakeLists.txt @@ -1,7 +1,9 @@ # Copyright (c) 2022-2023 Barcelona Supercomputing Center (BSC) # SPDX-License-Identifier: GPL-3.0-or-later +find_package(Nanos6) include(CheckOmpSs2Compiler) + if(NOT OMPSS2_COMPILER_FOUND) if(ENABLE_ALL_TESTS) message(FATAL_ERROR "Compiler doesn't support -fompss-2 flag, cannot enable Nanos6 RT tests") @@ -11,7 +13,6 @@ if(NOT OMPSS2_COMPILER_FOUND) return() endif() -find_package(Nanos6) if(NOT NANOS6_FOUND) if(ENABLE_ALL_TESTS) message(FATAL_ERROR "Nanos6 not found, cannot enable Nanos6 RT tests") diff --git a/test/rt/nodes/CMakeLists.txt b/test/rt/nodes/CMakeLists.txt index 053d736..62a0e90 100644 --- a/test/rt/nodes/CMakeLists.txt +++ b/test/rt/nodes/CMakeLists.txt @@ -1,7 +1,9 @@ # Copyright (c) 2022-2023 Barcelona Supercomputing Center (BSC) # SPDX-License-Identifier: GPL-3.0-or-later +find_package(Nodes) include(CheckOmpSs2Compiler) + if(NOT OMPSS2_COMPILER_FOUND) if(ENABLE_ALL_TESTS) message(FATAL_ERROR "Compiler doesn't support -fompss-2 flag, cannot enable NODES RT tests") @@ -11,7 +13,6 @@ if(NOT OMPSS2_COMPILER_FOUND) return() endif() -find_package(Nodes) if(NOT NODES_FOUND) if(ENABLE_ALL_TESTS) message(FATAL_ERROR "NODES not found, cannot enable NODES RT tests")