Skip to content

GitLab

Commit 69b5b2cb authored by Artur Wojcik's avatar Artur Wojcik
Browse files

fix merge error

parent bfe935a9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/CMakeLists.txt
View file @ 69b5b2cb
...@@ -267,6 +267,7 @@ target_link_libraries(migraphx PUBLIC Threads::Threads) ...@@ -267,6 +267,7 @@ target_link_libraries(migraphx PUBLIC Threads::Threads)
function(check_execution_par RESULT) function(check_execution_par RESULT)
set(CMAKE_REQUIRED_LIBRARIES ${ARGN}) set(CMAKE_REQUIRED_LIBRARIES ${ARGN})
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
if(NOT MSVC)
set(CMAKE_REQUIRED_FLAGS "-std=c++17") set(CMAKE_REQUIRED_FLAGS "-std=c++17")
endif() endif()
string(MD5 _flags_hash "${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_LIBRARIES}") string(MD5 _flags_hash "${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_LIBRARIES}")
...@@ -283,7 +284,7 @@ int main() { ...@@ -283,7 +284,7 @@ int main() {
endfunction() endfunction()
set(MIGRAPHX_HAS_EXECUTORS_DEFAULT Off) set(MIGRAPHX_HAS_EXECUTORS_DEFAULT Off)
find_package(TBB) find_package(TBB QUIET)
if(TBB_FOUND) if(TBB_FOUND)
check_execution_par(TBB_HAS_EXECUTION_PAR TBB::tbb) check_execution_par(TBB_HAS_EXECUTION_PAR TBB::tbb)
if(TBB_HAS_EXECUTION_PAR) if(TBB_HAS_EXECUTION_PAR)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment