Commit 6ff8e34e authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'FindOpenMP-Intel-Windows'

0c7433e8

 FindOpenMP: Fix support for Intel on Windows
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1957
parents 8c546287 0c7433e8
Pipeline #98719 passed with stage
in 0 seconds
...@@ -242,19 +242,10 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) ...@@ -242,19 +242,10 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
endforeach() endforeach()
set("${OPENMP_LIB_NAMES_VAR}" "${_OPENMP_LIB_NAMES}" PARENT_SCOPE) set("${OPENMP_LIB_NAMES_VAR}" "${_OPENMP_LIB_NAMES}" PARENT_SCOPE)
else() else()
# The Intel compiler on windows has no verbose mode, so we need to treat it explicitly # We do not know how to extract implicit OpenMP libraries for this compiler.
if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") # Assume that it handles them automatically, e.g. the Intel Compiler on
set("${OPENMP_LIB_NAMES_VAR}" "libiomp5md" PARENT_SCOPE) # Windows should put the dependency in its object files.
find_library(OpenMP_libiomp5md_LIBRARY set("${OPENMP_LIB_NAMES_VAR}" "" PARENT_SCOPE)
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()
endif() endif()
break() break()
elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL "AppleClang" elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL "AppleClang"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment