diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-24 18:35:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-09-27 13:55:47 (GMT) |
| commit | 42bf0f596e2a0047df52a3e910429aa8c27f467b (patch) | |
| tree | 03316a0272109c1fa418e3ecad5b0b0a2e6c7b52 | |
| parent | 5204262c0e91cda34b52dd6eb14423e5e0d85244 (diff) | |
| download | CMake-42bf0f596e2a0047df52a3e910429aa8c27f467b.zip CMake-42bf0f596e2a0047df52a3e910429aa8c27f467b.tar.gz CMake-42bf0f596e2a0047df52a3e910429aa8c27f467b.tar.bz2 | |
FindOpenMP: Simplify explicit "omp" library checks
For toolchains that do not provide a builtin `omp` library the compiler
driver's OpenMP flag should not be needed when linking. We also do not
need the compiler driver's verbose flag because we are not parsing its
output.
| -rw-r--r-- | Modules/FindOpenMP.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index f88e43c..c924128 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -336,8 +336,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT LOG_DESCRIPTION "Trying ${LANG} OpenMP compiler with '${OpenMP_libomp_LIBRARY}'" - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}" - LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY} + COMPILE_DEFINITIONS ${OPENMP_FLAG} + LINK_LIBRARIES ${OpenMP_libomp_LIBRARY} ) if(NOT OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}) find_path(OpenMP_${LANG}_INCLUDE_DIR omp.h) @@ -347,9 +347,9 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT LOG_DESCRIPTION "Trying ${LANG} OpenMP compiler with '${OpenMP_libomp_LIBRARY}' and '${OpenMP_${LANG}_INCLUDE_DIR}'" - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}" - "-DINCLUDE_DIRECTORIES:STRING=${OpenMP_${LANG}_INCLUDE_DIR}" - LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY} + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${OpenMP_${LANG}_INCLUDE_DIR}" + COMPILE_DEFINITIONS ${OPENMP_FLAG} + LINK_LIBRARIES ${OpenMP_libomp_LIBRARY} ) endif() endif() @@ -370,8 +370,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT LOG_DESCRIPTION "Trying ${LANG} OpenMP compiler with '${OpenMP_libomp_LIBRARY}'" - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}" - LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY} + COMPILE_DEFINITIONS ${OPENMP_FLAG} + LINK_LIBRARIES ${OpenMP_libomp_LIBRARY} ) if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}) set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE) |