Skip to content

Commit e7966c0

Browse files
committed
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 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/openmp/branches/release_70@338728 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 622cfa2 commit e7966c0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Optional Features
194194
**LIBOMP_OMPT_SUPPORT** = ``ON|OFF``
195195
Include support for the OpenMP Tools Interface (OMPT).
196196
This option is supported and ``ON`` by default for x86, x86_64, AArch64, and
197-
PPC64 on Linux*, Windows*, and macOS*.
197+
PPC64 on Linux* and macOS*.
198198
This option is ``OFF`` if this feature is not supported for the platform.
199199

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

runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ endif()
302302
# OMPT-support defaults to ON for OpenMP 5.0+ and if the requirements in
303303
# cmake/config-ix.cmake are fulfilled.
304304
set(OMPT_DEFAULT FALSE)
305-
if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT))
305+
if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT) AND (NOT WIN32))
306306
set(OMPT_DEFAULT TRUE)
307307
endif()
308308
set(LIBOMP_OMPT_SUPPORT ${OMPT_DEFAULT} CACHE BOOL

0 commit comments

Comments
 (0)