bobqianic commited on
Commit
44ab249
·
unverified ·
1 Parent(s): 8862803

cmake : fix MSVC compile error C3688 (#1136)

Browse files

Instead of simply using 'add_compile_options(/utf-8)' to address the MSVC compile error C3688, a better approach would be to handle it in a way that prevents passing '/utf-8' to NVCC.

Files changed (1) hide show
  1. CMakeLists.txt +13 -10
CMakeLists.txt CHANGED
@@ -251,17 +251,20 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES
251
  else()
252
  message(STATUS "x86 detected")
253
  if (MSVC)
254
- if(NOT WHISPER_NO_AVX2)
255
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
256
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2")
257
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
258
- else()
259
- if(NOT WHISPER_NO_AVX)
260
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
261
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX")
262
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX")
263
- endif()
 
 
264
  endif()
 
265
  else()
266
  if (EMSCRIPTEN)
267
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
 
251
  else()
252
  message(STATUS "x86 detected")
253
  if (MSVC)
254
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
255
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /utf-8")
256
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
257
+ if(NOT WHISPER_NO_AVX2)
258
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
259
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2")
260
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
261
+ else()
262
+ if(NOT WHISPER_NO_AVX)
263
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
264
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX")
265
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX")
266
  endif()
267
+ endif()
268
  else()
269
  if (EMSCRIPTEN)
270
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")