[Bf-blender-cvs] [874af5301cd] master: Cleanup: Fix build-warning with MSVC

Ray Molenkamp noreply at git.blender.org
Sat Jun 20 01:28:48 CEST 2020


Commit: 874af5301cdf761f846966f4d7f22bd06adb1e56
Author: Ray Molenkamp
Date:   Fri Jun 19 17:28:42 2020 -0600
Branches: master
https://developer.blender.org/rB874af5301cdf761f846966f4d7f22bd06adb1e56

Cleanup: Fix build-warning with MSVC

Draco sets CMAKE_CXX_STANDARD to 14, given we
set the c++ standard in the root level CMakeLists.txt
to c++17 this generated build warnings.

Given the rootlevel one is the one we want we can
safely remove this line in dracos cmakelists

===================================================================

M	extern/draco/CMakeLists.txt

===================================================================

diff --git a/extern/draco/CMakeLists.txt b/extern/draco/CMakeLists.txt
index a3f9a8b9561..6961fa8a769 100644
--- a/extern/draco/CMakeLists.txt
+++ b/extern/draco/CMakeLists.txt
@@ -18,8 +18,6 @@
 # All rights reserved.
 # ***** END GPL LICENSE BLOCK *****
 
-set(CMAKE_CXX_STANDARD 14)
-
 # Build Draco library.
 add_subdirectory(dracoenc)



More information about the Bf-blender-cvs mailing list