Skip to content

Commit

Permalink
merge master into release/rocm-rel-5.1
Browse files Browse the repository at this point in the history
Fixes: SWDEV-324185
Change-Id: I0bbf13f85b02113bfbd743b6d965b84630db9abc
  • Loading branch information
searlmc1 committed Mar 10, 2022
2 parents db71d00 + 0f00d53 commit 548d7de
Show file tree
Hide file tree
Showing 4 changed files with 745 additions and 73 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ if(LLVM_PACKAGE_VERSION VERSION_GREATER "9.0.1")
target_link_libraries(hipify-clang PRIVATE LLVMFrontendOpenMP)
endif()

if(LLVM_PACKAGE_VERSION VERSION_EQUAL "15.0.0" OR LLVM_PACKAGE_VERSION VERSION_GREATER "15.0.0")
target_link_libraries(hipify-clang PRIVATE LLVMWindowsDriver)
endif()

if(MSVC)
target_link_libraries(hipify-clang PRIVATE version)
target_compile_options(hipify-clang PRIVATE /std:c++14 /Od /GR- /EHs- /EHc-)
Expand Down
Loading

0 comments on commit 548d7de

Please sign in to comment.