diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-17 11:29:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-17 11:29:33 (GMT) |
| commit | 6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51 (patch) | |
| tree | 3eb9b31131f5289d3a1ffb1bd1138ec3f0cc9d21 /Modules/FindOpenMP.cmake | |
| parent | 8c546287ddadedb7263e9c21115add253c3a82a8 (diff) | |
| parent | 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee (diff) | |
| download | CMake-6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51.zip CMake-6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51.tar.gz CMake-6ff8e34e5efdd9b621d64a9bc6bc7b436f01ae51.tar.bz2 | |
Merge topic 'FindOpenMP-Intel-Windows'
0c7433e874 FindOpenMP: Fix support for Intel on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1957
Diffstat (limited to 'Modules/FindOpenMP.cmake')
| -rw-r--r-- | Modules/FindOpenMP.cmake | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index e252ba5..329ace1 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -242,19 +242,10 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) endforeach() set("${OPENMP_LIB_NAMES_VAR}" "${_OPENMP_LIB_NAMES}" PARENT_SCOPE) else() - # The Intel compiler on windows has no verbose mode, so we need to treat it explicitly - if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - set("${OPENMP_LIB_NAMES_VAR}" "libiomp5md" PARENT_SCOPE) - find_library(OpenMP_libiomp5md_LIBRARY - NAMES "libiomp5md" - HINTS ${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES} - CMAKE_FIND_ROOT_PATH_BOTH - NO_DEFAULT_PATH - ) - mark_as_advanced(OpenMP_libiomp5md_LIBRARY) - else() - set("${OPENMP_LIB_NAMES_VAR}" "" PARENT_SCOPE) - endif() + # We do not know how to extract implicit OpenMP libraries for this compiler. + # Assume that it handles them automatically, e.g. the Intel Compiler on + # Windows should put the dependency in its object files. + set("${OPENMP_LIB_NAMES_VAR}" "" PARENT_SCOPE) endif() break() elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL "AppleClang" |