Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / platform / platform_win32.cmake
index 0ee0845be33a6264952b0eb274962caa3d8024a5..468e82e8dacd39c6f012e63b7abc62548aeb0915 100644 (file)
@@ -130,8 +130,8 @@ include(InstallRequiredSystemLibraries)
 
 remove_cc_flag("/MDd" "/MD")
 
-if(MSVC_CLANG) # Clangs version of cl doesn't support all flags 
-       if(NOT WITH_CXX11) # C++11 is on by default in clang-cl and can't be turned off, if c++11 is not enabled in blender repress some c++11 related warnings. 
+if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
+       if(NOT WITH_CXX11) # C++11 is on by default in clang-cl and can't be turned off, if c++11 is not enabled in blender repress some c++11 related warnings.
                set(CXX_WARN_FLAGS "-Wno-inconsistent-missing-override")
        endif()
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
@@ -425,7 +425,7 @@ if(WITH_OPENIMAGEIO)
        set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
        set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
        set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-       
+
        set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
        set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
        set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
@@ -474,7 +474,7 @@ if(WITH_OPENVDB)
        set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
        set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
        set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
-       
+
 endif()
 
 if(WITH_ALEMBIC)