FEM Post: Always build except for VTK <6.2

VTK 6.0 has a bug which makes it incompatibel with c++11
2016-05-22 13:03:42 +02:00
parent e982084e3f
commit 2fb14ce9c4
4 changed files with 8 additions and 13 deletions
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -8,9 +8,6 @@ if(BUILD_FEM_NETGEN)
    add_definitions(-DFCWithNetgen ${NETGEN_DEFINITIONS})
 endif(BUILD_FEM_NETGEN)

-find_package(VTK REQUIRED)
-include(${VTK_USE_FILE})
-
 include_directories(
    ${CMAKE_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -1,9 +1,10 @@

 if(BUILD_FEM_VTK)
-    include(${VTK_USE_FILE})
    add_definitions(-DFC_USE_VTK)
 endif(BUILD_FEM_VTK)

+include(${VTK_USE_FILE})
+    
 add_subdirectory(App)

 if(BUILD_GUI)
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -6,6 +6,7 @@ endif(MSVC)

 if (BUILD_SMESH)
    add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO)
+    include(${VTK_USE_FILE})
 endif(BUILD_SMESH)

 if(BUILD_FEM_NETGEN)