From d4132b63826e4507b870f9fccdbcb41af755a9d4 Mon Sep 17 00:00:00 2001 From: Marcel Koch Date: Tue, 31 Oct 2023 15:08:30 +0100 Subject: [PATCH] review updates: - unused variable - correct return code - consistent ifdef check Co-authored-by: Yu-Hsiang M. Tsai Co-authored-by: Pratik Nayak Co-authored-by: Tobias Ribizel --- CMakeLists.txt | 1 - cmake/openmpi_test.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78ba1f939cb..fbda6bfb8f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,6 @@ if(GINKGO_BUILD_MPI) ${Ginkgo_SOURCE_DIR}/cmake/openmpi_test.cpp COMPILE_DEFINITIONS -DCHECK_HAS_OPEN_MPI=1 LINK_LIBRARIES MPI::MPI_CXX - OUTPUT_VARIABLE output ) if(uses_openmpi) try_compile(valid_openmpi_version diff --git a/cmake/openmpi_test.cpp b/cmake/openmpi_test.cpp index 7580a908b6c..918e670cd8a 100644 --- a/cmake/openmpi_test.cpp +++ b/cmake/openmpi_test.cpp @@ -40,11 +40,10 @@ int main() { #if CHECK_HAS_OPEN_MPI && defined(OPEN_MPI) && OPEN_MPI static_assert(true); -#elif CHECK_OPEN_MPI_VERSION +#elif CHECK_OPEN_MPI_VERSION && defined(OPEN_MPI) && OPEN_MPI static_assert(OMPI_MAJOR_VERSION > 4 || (OMPI_MAJOR_VERSION == 4 && OMPI_MINOR_VERSION >= 1)); #else static_assert(false); #endif - return 1; }