From 6f136808a94322361436a6472be1989152e0d732 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Sep 2024 18:39:14 -0400 Subject: Tests/FindOpenMP: Add label for Fortran when it is enabled --- Tests/FindOpenMP/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/FindOpenMP/CMakeLists.txt b/Tests/FindOpenMP/CMakeLists.txt index e64885d..ea90baa 100644 --- a/Tests/FindOpenMP/CMakeLists.txt +++ b/Tests/FindOpenMP/CMakeLists.txt @@ -19,3 +19,6 @@ add_test(NAME FindOpenMP.Test COMMAND -DOpenMP_TEST_Fortran=${CMake_TEST_FindOpenMP_FLAG_Fortran} --test-command ${CMAKE_CTEST_COMMAND} -V -C $ ) +if(CMake_TEST_FindOpenMP_FLAG_Fortran) + set_property(TEST FindOpenMP.Test APPEND PROPERTY LABELS "Fortran") +endif() -- cgit v0.12 From 795be0f55f1737d2211d9e628cdb5c78bd965a87 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 23 Sep 2024 15:45:51 -0400 Subject: Tests/FindOpenMP: Verify linking to OpenMP libraries Previously we only verified the `_OPENMP` preprocessor symbol. --- Tests/FindOpenMP/Test/CMakeLists.txt | 4 ++-- Tests/FindOpenMP/Test/main.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Tests/FindOpenMP/Test/CMakeLists.txt b/Tests/FindOpenMP/Test/CMakeLists.txt index 7ead835..4083855 100644 --- a/Tests/FindOpenMP/Test/CMakeLists.txt +++ b/Tests/FindOpenMP/Test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) project(TestFindOpenMP NONE) include(CTest) @@ -54,7 +54,7 @@ foreach(c C CXX Fortran) add_executable(test_var_${c} ${OpenMPTEST_SOURCE_FILE}) separate_arguments(_OpenMP_${c}_OPTIONS NATIVE_COMMAND "${OpenMP_${c}_FLAGS}") target_compile_options(test_var_${c} PRIVATE "${_OpenMP_${c}_OPTIONS}") - target_link_libraries(test_var_${c} PRIVATE "${OpenMP_${c}_FLAGS}") + target_link_libraries(test_var_${c} PRIVATE ${OpenMP_${c}_LIBRARIES}) target_include_directories(test_var_${c} PRIVATE ${OpenMP_${c}_INCLUDE_DIRS}) set_property(TARGET test_var_${c} PROPERTY LINKER_LANGUAGE ${c}) add_test(NAME test_var_${c} COMMAND test_var_${c}) diff --git a/Tests/FindOpenMP/Test/main.c b/Tests/FindOpenMP/Test/main.c index 9fb67e4..f7abef8 100644 --- a/Tests/FindOpenMP/Test/main.c +++ b/Tests/FindOpenMP/Test/main.c @@ -1,7 +1,10 @@ #include int main(void) { -#ifndef _OPENMP - breaks_on_purpose +#ifdef _OPENMP + omp_get_num_threads(); +#else +# error "_OPENMP not defined!" #endif + return 0; } -- cgit v0.12