fix merge error

69b5b2cb · Artur Wojcik · bfe935a9 · 69b5b2cb
Commit 69b5b2cb authored Nov 24, 2023 by Artur Wojcik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/CMakeLists.txt src/CMakeLists.txt +2 -1

No files found.
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -267,6 +267,7 @@ target_link_libraries(migraphx PUBLIC Threads::Threads)
 function(check_execution_par RESULT)
    set(CMAKE_REQUIRED_LIBRARIES ${ARGN})
    set(CMAKE_REQUIRED_FLAGS)
+    if(NOT MSVC)
        set(CMAKE_REQUIRED_FLAGS "-std=c++17")
    endif()
    string(MD5 _flags_hash "${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_LIBRARIES}")
@@ -283,7 +284,7 @@ int main() {
 endfunction()

 set(MIGRAPHX_HAS_EXECUTORS_DEFAULT Off)
-find_package(TBB)
+find_package(TBB QUIET)
 if(TBB_FOUND)
    check_execution_par(TBB_HAS_EXECUTION_PAR TBB::tbb)
    if(TBB_HAS_EXECUTION_PAR)