]> git.djapps.eu Git - pkg/ggml/sources/whisper.cpp/commitdiff
Fixed compile definitions and link libraries for MSVC
authorMikhail Grigorev <redacted>
Thu, 27 Oct 2022 09:59:02 +0000 (14:59 +0500)
committerGeorgi Gerganov <redacted>
Thu, 27 Oct 2022 14:20:49 +0000 (17:20 +0300)
CMakeLists.txt

index 5a245d67ef1d92d4497d9c011c9a9e26cf27d9cb..447c8b939e1038b9b1ab2a2c1376b8adc16b9051 100644 (file)
@@ -121,7 +121,8 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES
 else()
     message(STATUS "x86 detected")
     if (MSVC)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2 /D_CRT_SECURE_NO_WARNINGS=1")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
+        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /arch:AVX2")
     else()
         if (EMSCRIPTEN)
             # we require support for WASM SIMD 128-bit
@@ -148,7 +149,11 @@ target_include_directories(${TARGET} PUBLIC
     .
     )
 
-target_link_libraries(${TARGET} PRIVATE m ${WHISPER_EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+if (MSVC)
+  target_link_libraries(${TARGET} PRIVATE ${WHISPER_EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+else()
+  target_link_libraries(${TARGET} PRIVATE m ${WHISPER_EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+endif()
 
 if (BUILD_SHARED_LIBS)
     target_link_libraries(${TARGET} PUBLIC
@@ -158,6 +163,10 @@ if (BUILD_SHARED_LIBS)
     target_compile_definitions(${TARGET} PUBLIC
         WHISPER_SHARED
         )
+
+    if (MSVC)
+        target_compile_definitions(${TARGET} PUBLIC __AVX2__ _CRT_SECURE_NO_WARNINGS)
+    endif()
 endif()
 
 target_compile_definitions(${TARGET} PUBLIC