瀏覽代碼

Remove VTK 6 & 7 support. This was driven by VTK 8 deprecation of vtkHyperOctree.

iss7
Trevor Irons 5 年之前
父節點
當前提交
4f5cf8deed
共有 3 個文件被更改,包括 33 次插入51 次删除
  1. 32
    49
      CMakeLists.txt
  2. 1
    1
      Modules/FDEM1D/include/PolygonalWireAntenna.h
  3. 0
    1
      Modules/FDEM1D/src/PolygonalWireAntenna.cpp

+ 32
- 49
CMakeLists.txt 查看文件

@@ -9,8 +9,8 @@ SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
9 9
 ####################################################################################################
10 10
 # Lemma versioning, set Major, minor, and patch here                                               #
11 11
 set(LEMMA_VERSION_MAJOR "0")                                                                       #
12
-set(LEMMA_VERSION_MINOR "2")                                                                       #
13
-set(LEMMA_VERSION_PATCH "3")                                                                       #
12
+set(LEMMA_VERSION_MINOR "3")                                                                       #
13
+set(LEMMA_VERSION_PATCH "0")                                                                       #
14 14
 set(LEMMA_VERSION "\"${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}\"")      #
15 15
 set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}") #
16 16
 ####################################################################################################
@@ -51,8 +51,7 @@ option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
51 51
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
52 52
 option ( LEMMA_BUILD_DOCUMENTATION  "Build Doxygen man pages" OFF )
53 53
 
54
-option (LEMMA_VTK6_SUPPORT "VTK 6.x library for visualisation and grids" OFF)
55
-option (LEMMA_VTK7_SUPPORT "VTK 7.x library for visualisation and grids" OFF)
54
+#option (LEMMA_VTK7_SUPPORT "VTK 7.x library for visualisation and grids" OFF)
56 55
 option (LEMMA_VTK8_SUPPORT "VTK 8.x library for visualisation and grids" OFF)
57 56
 
58 57
 #option (CMAKE_CROSSCOMPILING "Target different arch than you are on" OFF)
@@ -185,54 +184,38 @@ endif()
185 184
 ###################
186 185
 
187 186
 # We don't build VTK, it is too heavy.
188
-
189
-if ( LEMMA_VTK6_SUPPORT ) 
190
-	#find_package(VTK 6 REQUIRED NO_MODULE)
191
-	find_package(VTK 6.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
192
-			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkInteractionStyle 
193
-			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL NO_MODULE)
194
-	set(volumeRenderer volumerenderer.cxx)
195
-	include(${VTK_USE_FILE}) 
196
-	add_compile_options(-DLEMMAUSEVTK) 
197
-	# Compile Matplot_vtk if VTK is present
198
-	#add_subdirectory(Matplot_vtk)	
199
-	#include_directories ("${PROJECT_SOURCE_DIR}/Matplot_vtk")
200
-endif()
201
-
202
-
203
-if ( LEMMA_VTK7_SUPPORT ) 
204
-	#find_package(VTK 7 REQUIRED NO_MODULE)
205
-	find_package(VTK 7.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
206
-			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkInteractionStyle 
207
-			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
208
-	set(volumeRenderer volumerenderer.cxx)
209
-	if (VTK_FOUND)
210
-		message(STATUS "VTK 7 was found! ") 
211
-	        include(${VTK_USE_FILE}) 
212
-		#add_compile_options(-DLEMMAUSEVTK)
213
-		#target_compile_definitions( lemmacore PRIVATE LEMMAUSEVTK=1 )
214
-		add_definitions(-DLEMMAUSEVTK) 
215
-	else()
216
-		ExternalProject_Add(VTK
217
-  		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
218
-		GIT_TAG  "v7.1.1"
219
-    	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk7
220
-  		CMAKE_ARGS
221
-   	        -DBUILD_SHARED_LIBS:BOOL=ON
222
-	        -DBUILD_EXAMPLES:BOOL=OFF
223
-	        -DBUILD_TESTING:BOOL=OFF
224
-		    -DVTK_Group_Web:BOOL=OFF
225
-	        -DModule_vtkImagingMath:BOOL=ON
226
-	  	    LOG_DOWNLOAD 0
227
-	  	    LOG_UPDATE 0
228
-		)
229
-	endif()
230
-endif()
231
-
187
+#if ( LEMMA_VTK7_SUPPORT ) 
188
+#	#find_package(VTK 7 REQUIRED NO_MODULE)
189
+#	find_package(VTK 7.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
190
+#			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
191
+#			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
192
+#	set(volumeRenderer volumerenderer.cxx)
193
+#	if (VTK_FOUND)
194
+#		message(STATUS "VTK 7 was found! ") 
195
+#	        include(${VTK_USE_FILE}) 
196
+#		#add_compile_options(-DLEMMAUSEVTK)
197
+#		#target_compile_definitions( lemmacore PRIVATE LEMMAUSEVTK=1 )
198
+#		add_definitions(-DLEMMAUSEVTK) 
199
+#	else()
200
+#		ExternalProject_Add(VTK
201
+#  		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
202
+#		GIT_TAG  "v7.1.1"
203
+#    	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk7
204
+#  		CMAKE_ARGS
205
+#  	        -DBUILD_SHARED_LIBS:BOOL=ON
206
+#	        -DBUILD_EXAMPLES:BOOL=OFF
207
+#	        -DBUILD_TESTING:BOOL=OFF
208
+#		    -DVTK_Group_Web:BOOL=OFF
209
+#	        -DModule_vtkImagingMath:BOOL=ON
210
+#	  	    LOG_DOWNLOAD 0
211
+#	  	    LOG_UPDATE 0
212
+#		)
213
+#	endif()
214
+#endif()
232 215
 
233 216
 if ( LEMMA_VTK8_SUPPORT ) 
234 217
 	find_package(VTK 8.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
235
-			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkInteractionStyle 
218
+			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
236 219
 			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
237 220
 	if (VTK_FOUND)
238 221
 		message(STATUS "VTK 8 was found! ") 

+ 1
- 1
Modules/FDEM1D/include/PolygonalWireAntenna.h 查看文件

@@ -28,7 +28,7 @@ namespace Lemma {
28 28
     // ===================================================================
29 29
     class PolygonalWireAntenna : public WireAntenna {
30 30
 
31
-        friend std::ostream &operator<<(std::ostream &stream, const PolygonalWireAntenna &ob);
31
+        friend std::ostream &operator << (std::ostream &stream, const PolygonalWireAntenna &ob);
32 32
 
33 33
         public:
34 34
 

+ 0
- 1
Modules/FDEM1D/src/PolygonalWireAntenna.cpp 查看文件

@@ -8,7 +8,6 @@
8 8
   @file
9 9
   @author   Trevor Irons
10 10
   @date     05/18/2010
11
-  @version  $Id: PolygonalWireAntenna.cpp 211 2015-02-27 05:43:26Z tirons $
12 11
  **/
13 12
 
14 13
 #include "PolygonalWireAntenna.h"

Loading…
取消
儲存