+ do not pollute all projects with vtk options that don't use this li…

…brary
FreeCAD · Jun 16, 2016 · c8a0252 · c8a0252
1 parent e23973e
commit c8a0252
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -559,7 +559,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         endif()
         if(${VTK_MAJOR_VERSION} EQUAL 6)
             if(${VTK_MINOR_VERSION} LESS 2)
-                add_definitions(-DVTK_NO_QUAD_POLY )
+                set(VTK_OPTIONS -DVTK_NO_QUAD_POLY)
             endif()
             if(${VTK_MINOR_VERSION} EQUAL 0)
                 message(WARNING "VTK <6.0 cannot be used with c++11, FEM postprocessing is disabled")

diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -16,6 +16,10 @@ if(CMAKE_COMPILER_IS_CLANGXX)
     set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-self-assign -Wno-reorder -Wno-switch-enum -Wno-unknown-pragmas -Wno-logical-op-parentheses -Wno-unused-variable -Wno-unused-function -Wno-overloaded-virtual")
 endif()
 
+if (VTK_OPTIONS)
+    add_definitions(${VTK_OPTIONS})
+endif()
+
 include(${VTK_USE_FILE})
 include_directories(
     src/SMDS