Просмотр исходного кода

Fix issue compiling when assimp added as subdirectory and parent project defines /utf-8 compile flag (#6186)

Co-authored-by: Kim Kulling <[email protected]>
Peter Lemanski 7 месяцев назад
Родитель
Сommit
d2aed87f5e
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      CMakeLists.txt

+ 5 - 2
CMakeLists.txt

@@ -347,8 +347,11 @@ ELSEIF(MSVC)
   elseif((GENERATOR_IS_MULTI_CONFIG) OR (CMAKE_BUILD_TYPE MATCHES Release))
     message("-- MSVC PDB generation disabled. Release binary will not be debuggable.")
   endif()
-  # Source code is encoded in UTF-8
-  ADD_COMPILE_OPTIONS(/source-charset:utf-8)
+  if(NOT /utf-8 IN_LIST CMAKE_CXX_FLAGS)
+    # Source code is encoded in UTF-8
+    ADD_COMPILE_OPTIONS(/source-charset:utf-8)
+  endif ()
+
 ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
   IF(NOT ASSIMP_HUNTER_ENABLED)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)