Merge remote-tracking branch 'origin/incoming' into stable
This commit is contained in:
commit
931ea549cb
|
@ -63,7 +63,7 @@ endif()
|
|||
find_package(Threads)
|
||||
if (${IS_GNU} OR ${IS_CLANG})
|
||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
||||
if (Threads_FOUND AND NOT MINGW)
|
||||
if (Threads_FOUND AND NOT (MINGW AND ${IS_CLANG}))
|
||||
include(FindOpenMP)
|
||||
if (OpenMP_CXX_FOUND)
|
||||
set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
|
|
Loading…
Reference in New Issue