@@ -2418,7 +2418,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../Internal/SerialPrograms/Internal0.
24182418endif ()
24192419
24202420#extract opencv_world4110d.dll from archive on Windows Debug builds
2421- if (MSVC )
2421+ if (WIN32 )
24222422 file (ARCHIVE_EXTRACT
24232423 INPUT ${CMAKE_CURRENT_SOURCE_DIR} /../3rdPartyBinaries/opencv_world4110d.zip
24242424 DESTINATION ${CMAKE_CURRENT_SOURCE_DIR} /../3rdPartyBinaries/
@@ -2433,7 +2433,7 @@ target_link_directories(SerialPrograms PRIVATE ../3rdPartyBinaries/)
24332433
24342434
24352435
2436- if (MSVC )
2436+ if (WIN32 )
24372437 add_library (OpenCV_lib IMPORTED UNKNOWN)
24382438 target_include_directories (SerialPrograms SYSTEM PRIVATE ../3rdParty/opencv-4.11.0/)
24392439 set_target_properties (OpenCV_lib PROPERTIES
@@ -2496,14 +2496,16 @@ if (MSVC)
24962496 PA_DPP
24972497 )
24982498
2499- target_compile_options (SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
2500- target_compile_options (SerialPrograms PRIVATE /wd5054) # Deprecated enum arithemtic
2501- target_compile_options (SerialPrograms PRIVATE /wd4505) # unreferenced local function has been removed
2499+ if (MSVC )
2500+ target_compile_options (SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
2501+ target_compile_options (SerialPrograms PRIVATE /wd5054) # Deprecated enum arithemtic
2502+ target_compile_options (SerialPrograms PRIVATE /wd4505) # unreferenced local function has been removed
25022503
2503- set (ARCH_FLAGS_09_Nehalem /W4) # Dummy parameter
2504- set (ARCH_FLAGS_13_Haswell /arch:AVX2)
2505- set (ARCH_FLAGS_17_Skylake /arch:AVX512)
2506- set (ARCH_FLAGS_19_IceLake /arch:AVX512)
2504+ set (ARCH_FLAGS_09_Nehalem /W4) # Dummy parameter
2505+ set (ARCH_FLAGS_13_Haswell /arch:AVX2)
2506+ set (ARCH_FLAGS_17_Skylake /arch:AVX512)
2507+ set (ARCH_FLAGS_19_IceLake /arch:AVX512)
2508+ endif ()
25072509
25082510 # Run-time ISA dispatching
25092511 target_compile_definitions (SerialPrograms PRIVATE PA_AutoDispatch_x64_08_Nehalem)
0 commit comments