Commit e6324b72 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r338721: 

------------------------------------------------------------------------
r338721 | hahnfeld | 2018-08-02 16:34:08 +0200 (Thu, 02 Aug 2018) | 7 lines

[OMPT] Disable by default on Windows

This is broken per PR36561 and PR36574, so disable it for now until
somebody interested can take a look. OMPT can still be activated manually
by passing -DLIBOMP_OMPT_SUPPORT=ON during configuration.

Differential Revision: https://reviews.llvm.org/D50086
------------------------------------------------------------------------

llvm-svn: 338728
parent 1cca79b0

openmp/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ Optional Features 
**LIBOMP_OMPT_SUPPORT** = ``ON|OFF``

  Include support for the OpenMP Tools Interface (OMPT). 

  This option is supported and ``ON`` by default for x86, x86_64, AArch64, and 

  PPC64 on Linux*, Windows*, and macOS*.

  PPC64 on Linux* and macOS*.

  This option is ``OFF`` if this feature is not supported for the platform.



**LIBOMP_OMPT_OPTIONAL** = ``ON|OFF``

openmp/runtime/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ endif() 
# OMPT-support defaults to ON for OpenMP 5.0+ and if the requirements in

# cmake/config-ix.cmake are fulfilled.

set(OMPT_DEFAULT FALSE)

if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT))

if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT) AND (NOT WIN32))

  set(OMPT_DEFAULT TRUE)

endif()

set(LIBOMP_OMPT_SUPPORT ${OMPT_DEFAULT} CACHE BOOL