1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
diff -ru visit2.7.1.old/src/engine/main/CMakeLists.txt visit2.7.1.new/src/engine/main/CMakeLists.txt
--- visit2.7.1.old/src/engine/main/CMakeLists.txt 2013-09-13 21:13:13.000000000 +0200
+++ visit2.7.1.new/src/engine/main/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -184,8 +184,8 @@
${engine_ser_exe_EPlot_ser}
engine_ser
visit_verdict
- vtkjpeg
- vtkpng
+ jpeg
+ png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
@@ -268,8 +268,8 @@
${engine_par_exe_EPlot_par}
engine_par
visit_verdict
- vtkjpeg
- vtkpng
+ jpeg
+ png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/mdserver/main/CMakeLists.txt visit2.7.1.new/src/mdserver/main/CMakeLists.txt
--- visit2.7.1.old/src/mdserver/main/CMakeLists.txt 2013-09-13 21:07:04.000000000 +0200
+++ visit2.7.1.new/src/mdserver/main/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -118,10 +118,10 @@
visit_verdict
vtkCommonCore
vtkIOCore
- vtktiff
+ tiff
${VTKZLIB_LIB}
- vtkpng
- vtkjpeg
+ png
+ jpeg
${ZLIB_LIB}
${CMAKE_THREAD_LIBS}
${DL_LIB}
diff -ru visit2.7.1.old/src/svn_bin/static_simV2.py visit2.7.1.new/src/svn_bin/static_simV2.py
--- visit2.7.1.old/src/svn_bin/static_simV2.py 2013-09-13 21:12:52.000000000 +0200
+++ visit2.7.1.new/src/svn_bin/static_simV2.py 2014-01-25 20:30:06.948654123 +0100
@@ -176,7 +176,7 @@
#
# Print the link lines that we'd have to use to get the -l's
#
-vtk_libs="-lvtkCommon -lvtkGraphics -lvtkHybrid -lvtkRendering -lvtkImaging -lvtkGenericFiltering -lvtkFiltering -lvtkIO -lvtksys -lvtkfreetype -lvtkftgl -lvtkjpeg -lvtktiff -lvtkpng -lvtkexpat -lvtklibxml2 -lvtkzlib "
+vtk_libs="-lvtkCommon -lvtkGraphics -lvtkHybrid -lvtkRendering -lvtkImaging -lvtkGenericFiltering -lvtkFiltering -lvtkIO -lvtksys -lvtkfreetype -lvtkftgl -ljpeg -ltiff -lpng -lexpat -lvtklibxml2 -lz "
frameworks = "-lGL "
if sys.platform == "darwin":
frameworks = "-framework OpenGL -framework AGL -framework SystemConfiguration -framework IOKit -framework Cocoa "
diff -ru visit2.7.1.old/src/tools/convert/CMakeLists.txt visit2.7.1.new/src/tools/convert/CMakeLists.txt
--- visit2.7.1.old/src/tools/convert/CMakeLists.txt 2013-10-09 22:15:21.000000000 +0200
+++ visit2.7.1.new/src/tools/convert/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -104,8 +104,8 @@
)
SET(VTK_EXTRA_LIBS
-vtkjpeg
-vtkpng
+jpeg
+png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/tools/dataserver/CMakeLists.txt visit2.7.1.new/src/tools/dataserver/CMakeLists.txt
--- visit2.7.1.old/src/tools/dataserver/CMakeLists.txt 2013-09-13 21:08:25.000000000 +0200
+++ visit2.7.1.new/src/tools/dataserver/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -69,9 +69,9 @@
)
SET(VTK_EXTRA_LIBS
-vtktiff
-vtkjpeg
-vtkpng
+tiff
+jpeg
+png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/tools/mcurvit/CMakeLists.txt visit2.7.1.new/src/tools/mcurvit/CMakeLists.txt
--- visit2.7.1.old/src/tools/mcurvit/CMakeLists.txt 2013-09-13 21:08:15.000000000 +0200
+++ visit2.7.1.new/src/tools/mcurvit/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -104,9 +104,9 @@
)
SET(VTK_EXTRA_LIBS
-vtktiff
-vtkjpeg
-vtkpng
+tiff
+jpeg
+png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/tools/protocol/CMakeLists.txt visit2.7.1.new/src/tools/protocol/CMakeLists.txt
--- visit2.7.1.old/src/tools/protocol/CMakeLists.txt 2013-09-13 21:08:16.000000000 +0200
+++ visit2.7.1.new/src/tools/protocol/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -75,9 +75,9 @@
)
SET(VTK_EXTRA_LIBS
-vtktiff
-vtkjpeg
-vtkpng
+tiff
+jpeg
+png
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/viewer/main/CMakeLists.txt visit2.7.1.new/src/viewer/main/CMakeLists.txt
--- visit2.7.1.old/src/viewer/main/CMakeLists.txt 2013-09-13 21:08:36.000000000 +0200
+++ visit2.7.1.new/src/viewer/main/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -272,8 +272,8 @@
${viewer_exe_IPlot}
${viewer_exe_VPlot}
viewer
- vtkpng
- vtkjpeg
+ png
+ jpeg
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
diff -ru visit2.7.1.old/src/visit_vtk/full/CMakeLists.txt visit2.7.1.new/src/visit_vtk/full/CMakeLists.txt
--- visit2.7.1.old/src/visit_vtk/full/CMakeLists.txt 2013-09-13 21:07:03.000000000 +0200
+++ visit2.7.1.new/src/visit_vtk/full/CMakeLists.txt 2014-01-25 20:30:06.948654123 +0100
@@ -122,7 +122,7 @@
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
-TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
+TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle tiff)
# Add vtk definitions
ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
|
GitWeb