@@ -2414,7 +2414,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../Internal/SerialPrograms/Internal0.
24142414endif ()
24152415
24162416#extract opencv_world4110d.dll from archive on Windows Debug builds
2417- if (MSVC )
2417+ if (WIN32 )
24182418 file (ARCHIVE_EXTRACT
24192419 INPUT ${CMAKE_CURRENT_SOURCE_DIR} /../3rdPartyBinaries/opencv_world4110d.zip
24202420 DESTINATION ${CMAKE_CURRENT_SOURCE_DIR} /../3rdPartyBinaries/
@@ -2429,7 +2429,7 @@ target_link_directories(SerialPrograms PRIVATE ../3rdPartyBinaries/)
24292429
24302430
24312431
2432- if (MSVC )
2432+ if (WIN32 )
24332433 add_library (OpenCV_lib IMPORTED UNKNOWN)
24342434 target_include_directories (SerialPrograms SYSTEM PRIVATE ../3rdParty/opencv-4.11.0/)
24352435 set_target_properties (OpenCV_lib PROPERTIES
@@ -2492,14 +2492,15 @@ if (MSVC)
24922492 PA_DPP
24932493 )
24942494
2495- target_compile_options (SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
2496- target_compile_options (SerialPrograms PRIVATE /wd5054) # Deprecated enum arithemtic
2497- target_compile_options (SerialPrograms PRIVATE /wd4505) # unreferenced local function has been removed
2495+ if (MSVC )
2496+ target_compile_options (SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8)
2497+ target_compile_options (SerialPrograms PRIVATE /wd5054) # Deprecated enum arithemtic
2498+ target_compile_options (SerialPrograms PRIVATE /wd4505) # unreferenced local function has been removed
24982499
2499- set (ARCH_FLAGS_09_Nehalem /W4) # Dummy parameter
2500- set (ARCH_FLAGS_13_Haswell /arch:AVX2)
2501- set (ARCH_FLAGS_17_Skylake /arch:AVX512)
2502- set (ARCH_FLAGS_19_IceLake /arch:AVX512)
2500+ set (ARCH_FLAGS_09_Nehalem /W4) # Dummy parameter
2501+ set (ARCH_FLAGS_13_Haswell /arch:AVX2)
2502+ set (ARCH_FLAGS_17_Skylake /arch:AVX512)
2503+ set (ARCH_FLAGS_19_IceLake /arch:AVX512)
25032504
25042505 # Run-time ISA dispatching
25052506 target_compile_definitions (SerialPrograms PRIVATE PA_AutoDispatch_x64_08_Nehalem)
0 commit comments