Skip to content

Commit 47a49e5

Browse files
committed
ENH: Remove remains of GLEW, QT, OPENGL
1 parent ca429a7 commit 47a49e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1
-9843
lines changed

CI/headers_check.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
'./CI/ctest2junit.xsl',
116116
'./CI/test/README',
117117
'./CMake/CppcheckTargets.cmake',
118-
'./CMake/FindGLEW.cmake',
119118
'./CMake/FindKWStyle.cmake',
120119
'./CMake/FindLibSVM.cmake',
121120
'./CMake/Findcppcheck.cmake',
@@ -128,7 +127,6 @@
128127
'./CMake/TopologicalSort.cmake',
129128
'./CMake/exportheader.cmake.in',
130129
'./CMake/pre-commit',
131-
'./CMake/qt.conf.in',
132130
'./Docker/Dockerfile',
133131
'./Docker/system-dependencies.txt',
134132
'./Documentation/Cookbook/Art/residual_registration-figure.tex',
@@ -137,19 +135,13 @@
137135
'./Documentation/Cookbook/Scripts/gdal-config',
138136
'./Modules/Visualization/Ice/README',
139137
'./Modules/Wrappers/SWIG/src/numpy.i',
140-
'./Packaging/Files/Monteverdi.icns',
141138
'./Packaging/Files/OTB Project.zip',
142-
'./Packaging/Files/qt.conf',
143139
'./Packaging/Files/template.app/Contents/Info.plist',
144140
'./Packaging/LICENSE',
145141
'./Packaging/patchelf_remove_warning.diff',
146142
'./Packaging/howto_update_makeself',
147143
'./Packaging/otb_update_makeself',
148144
'./SuperBuild/LICENSE',
149-
'./Utilities/Data/Icons/LICENSE.TXT',
150-
'./Utilities/Data/Icons/NOTES',
151-
'./Utilities/Data/monteverdi.desktop.in',
152-
'./Utilities/Data/monteverdi2.desktop',
153145
'./Utilities/Doxygen/doxygen.config.in',
154146
'./Utilities/Maintenance/BuildHeaderTest.py',
155147
'./Utilities/Maintenance/fix_typos.sh'

CI/macos-10.14.6-clang.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
# Configuration options for macOS
2222

2323
set(site_option
24-
"OTB_USE_GLUT=OFF
25-
OTB_USE_GLFW=OFF
26-
CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
24+
"CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
2725
CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache
28-
OPENGL_INCLUDE_DIR:STRING=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/OpenGL.framework/Headers
2926
OTB_DATA_USE_LARGEINPUT:BOOL=ON")
3027
# Large input path are in an environment variable on macOS

CMake/CTestCustom.cmake.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
6262
".*/Modules/Wrappers/SWIG/src/python/otbApplicationPYTHON_wrap.*"
6363
".*/Modules/Wrappers/SWIG/src/java/otbApplicationJAVA_wrap.*"
6464

65-
# Exclude Qt moc file
66-
".*moc_.*"
6765
)
6866

6967
set(CTEST_CUSTOM_WARNING_EXCEPTION

CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,6 @@ set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_
155155

156156
get_package_name(${OTB_SOURCE_DIR} ${PROJECT_NAME} OTB_VERSION_STRING2)
157157

158-
# Monteverdi version number (follows OTB)
159-
set( Monteverdi_VERSION_MAJOR ${OTB_VERSION_MAJOR} )
160-
set( Monteverdi_VERSION_MINOR ${OTB_VERSION_MINOR} )
161-
set( Monteverdi_VERSION_PATCH ${OTB_VERSION_PATCH} )
162-
set( Monteverdi_VERSION_SUFFIX "" )
163-
164-
set( Monteverdi_VERSION_STRING
165-
"${Monteverdi_VERSION_MAJOR}.${Monteverdi_VERSION_MINOR}.${Monteverdi_VERSION_PATCH}${Monteverdi_VERSION_SUFFIX}"
166-
)
167-
168158
#-----------------------------------------------------------------------------
169159
string(TIMESTAMP OTB_BUILD_TIMESTAMP)
170160

@@ -550,13 +540,6 @@ list(APPEND option_list GEOTIFF)
550540
list(APPEND option_list ITK)
551541
list(APPEND option_list TINYXML)
552542

553-
#RK
554-
#Q: Why these two guys here? we already have option_list
555-
#A: Because cmake case sensitivity with variables.
556-
557-
if(OTB_USE_QT)
558-
list(APPEND option_list QT)
559-
endif()
560543
#sort again!
561544
list(SORT option_list)
562545

Documentation/Cookbook/rst/C++/WriteAnApplication.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,6 @@ CommandLine :
353353
*otbApplicationLauncherCommandLine* executable followed by the
354354
classname, the application dir and the application parameters.
355355

356-
QT :
357-
Application can be encapsuled in Qt framework using
358-
*otbApplicationLauncherQt* executable followed by the classname and
359-
the application dir.
360-
361356
Python :
362357
A Python wrapper is also available.
363358

NOTICE

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,6 @@ library.
134134
https://github.com/opencv/opencv/blob/master/LICENSE
135135

136136

137-
This software includes code from the Qt project.
138-
Copyright (c) 2015, The Qt Company Ltd.
139-
https://www.qt.io/
140-
Qt 4 is released under GNU LGPL v2.1 license:
141-
http://doc.qt.io/qt-4.8/lgpl.html
142-
143-
144137
This software includes code from the SiftFast project.
145138
Copyright (c) 2008-2010, zerofrog(@gmail.com)
146139
http://libsift.sourceforge.net
@@ -150,34 +143,6 @@ This software includes code from the SiftFast project.
150143
https://sourceforge.net/p/libsift/code/HEAD/tree/trunk/LICENSE
151144

152145

153-
This software includes code from the Mesa 3D project.
154-
Copyright (c) 1999-2017 Brian Paul and many other contributors
155-
https://www.mesa3d.org/
156-
FreeGLUT is released under MIT License:
157-
https://www.mesa3d.org/license.html
158-
159-
160-
This software includes code from the FreeGLUT project.
161-
Copyright (c) 1999-2000 Pawel W. Olszta
162-
http://freeglut.sourceforge.net/
163-
FreeGLUT is released under X11/MIT derivate License:
164-
https://sourceforge.net/p/freeglut/code/HEAD/tree/trunk/freeglut/freeglut/COPYING
165-
166-
167-
This software includes code from the GLFW project.
168-
Copyright (c) 2002-2006, Marcus Geelnard
169-
Copyright (c) 2006-2016, Camilla Berglund
170-
http://www.glfw.org/
171-
GLFW is released under zlib/libpng license:
172-
http://www.glfw.org/license.html
173-
174-
175-
This software includes code from the GLEW project.
176-
http://glew.sourceforge.net/
177-
The GLEW source code is licensed under the BSD 3-Clause license.
178-
https://github.com/nigels-com/glew/blob/master/LICENSE.txt
179-
180-
181146
This software includes code from the Open MPI project.
182147
Copyright (c) 2004-2010, The Trustees of Indiana University and Indiana
183148
University Research and Technology Corporation
@@ -253,12 +218,6 @@ binaries:
253218
http://www.boost.org/LICENSE_1_0.txt
254219

255220

256-
* CMake/FindGLEW.cmake
257-
Copyright (c) 2012-2013 Jakob Progsch
258-
ZLib license
259-
https://opensource.org/licenses/Zlib
260-
261-
262221
* CMake/FindKWStyle.cmake
263222
Copyright 2008-2013 Kitware, Inc.
264223
Copyright 2013 Brian Helba

SuperBuild/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@ option(OTB_USE_SIFTFAST "Enable module Siftfast in OTB" ON)
316316

317317

318318
option(OTB_USE_SHARK "Enable module Shark in OTB" ON)
319-
include (CMakeDependentOption)
320-
CMAKE_DEPENDENT_OPTION( OTB_USE_QWT "Enable module QWT in OTB" ON "OTB_USE_QT" OFF)
321319
option(OTB_USE_GSL "Enable module GSL in OTB" ON)
322320

323321
option(OTB_USE_MPI "Enable MPI in OTB" OFF)

SuperBuild/Copyright/GlewCopyright.txt

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)