diff options
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/llvm.cmake | 14 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake index 7a8ce2ddfec..7f54e83c92e 100644 --- a/build_files/build_environment/cmake/llvm.cmake +++ b/build_files/build_environment/cmake/llvm.cmake @@ -30,6 +30,10 @@ if(APPLE) set(BUILD_CLANG_TOOLS ON) endif() +if(UNIX AND NOT APPLE) + set(LLVM_BUILD_OPENMP ^^openmp) + set(LLVM_TARGETS ${LLVM_TARGETS} ^^NVPTX) +endif() set(LLVM_EXTRA_ARGS -DLLVM_USE_CRT_RELEASE=MD @@ -40,10 +44,18 @@ set(LLVM_EXTRA_ARGS -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_BUILD_LLVM_C_DYLIB=OFF -DLLVM_ENABLE_UNWIND_TABLES=OFF - -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA} + -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}${LLVM_BUILD_OPENMP} ${LLVM_XML2_ARGS} ) +if(UNIX AND NOT APPLE) + list(APPEND LLVM_EXTRA_ARGS + -DCLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_61 + -DLIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES=61 + ) +endif() + + if(WIN32) set(LLVM_GENERATOR "Ninja") else() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index fc0c37e4c8b..065c0b48416 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -63,7 +63,8 @@ if(EXISTS ${LIBDIR}) # OpenMP usually can't be statically linked into shared libraries, # due to not being compiled with position independent code. if(NOT WITH_PYTHON_MODULE) - set(WITH_OPENMP_STATIC ON) + #message(STATUS "============= ENABLING Static OpenMP") + #set(WITH_OPENMP_STATIC ON) endif() set(Boost_NO_BOOST_CMAKE ON) set(BOOST_ROOT ${LIBDIR}/boost) |