summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-16 15:51:18 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-11-16 15:51:20 (GMT)
commitee5867287ad4d71d6318294a51eb9eed1b2cde21 (patch)
tree814f709793dba3857b03791378ec7e53f26fcd8e /Modules
parent5b34fb20215b0b925357b98c9ae77b04ef7b2816 (diff)
parent98314d536e23168333bce28703668683192d7bd2 (diff)
downloadCMake-ee5867287ad4d71d6318294a51eb9eed1b2cde21.zip
CMake-ee5867287ad4d71d6318294a51eb9eed1b2cde21.tar.gz
CMake-ee5867287ad4d71d6318294a51eb9eed1b2cde21.tar.bz2
Merge topic 'fomp-no-def-path'
98314d53 FindOpenMP: Use NO_DEFAULT_PATH where appropriate Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1481
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindOpenMP.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 489476b..a6eba6e 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -230,6 +230,7 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
DOC "Path to the ${_OPENMP_IMPLICIT_LIB_PLAIN} library for OpenMP"
HINTS ${OpenMP_${LANG}_IMPLICIT_LINK_DIRS}
CMAKE_FIND_ROOT_PATH_BOTH
+ NO_DEFAULT_PATH
)
endif()
mark_as_advanced(OpenMP_${_OPENMP_IMPLICIT_LIB_PLAIN}_LIBRARY)
@@ -244,6 +245,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
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()