diff --git a/CI/configure_options.cmake b/CI/configure_options.cmake index d0b41c6adc0fe7546fecfbb698a5710cf849755d..861e24eeccea3d816cdb31da419ef6fda03459af 100644 --- a/CI/configure_options.cmake +++ b/CI/configure_options.cmake @@ -55,8 +55,7 @@ OTB_USE_SSE_FLAGS:BOOL=ON OTB_MPIEXEC_OPT:STRING=--allow-run-as-root") set (otb_wrap_option -"OTB_WRAP_JAVA:BOOL=ON -OTB_WRAP_PYTHON:BOOL=ON") +"OTB_WRAP_PYTHON:BOOL=ON") set (otb_data_option "OTB_DATA_USE_LARGEINPUT:BOOL=OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ffe654ab3f8e0b5a2892cc95206595e3b23f1f8..c162d39a17e6c8203d186fdad434ae93a651dc74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,9 +165,6 @@ endif() if(NOT OTB_INSTALL_PYTHON_DIR) set(OTB_INSTALL_PYTHON_DIR "${OTB_INSTALL_LIBRARY_DIR}/otb/python") endif() -if(NOT OTB_INSTALL_JAVA_DIR) - set(OTB_INSTALL_JAVA_DIR "${OTB_INSTALL_LIBRARY_DIR}/otb/java") -endif() if(NOT OTB_INSTALL_DATA_DIR) set(OTB_INSTALL_DATA_DIR "share/otb") endif() @@ -533,7 +530,6 @@ foreach(otb_option CMAKE_CXX_FLAGS ${option_list} OTB_WRAP_PYTHON - OTB_WRAP_JAVA OTB_DATA_ROOT OTB_USE_OPENMP OTB_USE_SSE_FLAGS diff --git a/NOTICE b/NOTICE index 10cc07d9a347054e581a312b95d868cd410b35ea..ece9fc15b3d6f6a430463bfdde6512cb794595ee 100644 --- a/NOTICE +++ b/NOTICE @@ -334,20 +334,6 @@ binaries: http://www.boost.org/LICENSE_1_0.txt -* CMake/UseJava.cmake - Copyright 2010-2011 Andreas schneider <asn@redhat.com> - Copyright 2010 Ben Boeckel <ben.boeckel@kitware.com> - BSD 3-Clause license - https://opensource.org/licenses/BSD-3-Clause - - -* CMake/UseJavaClassFilelist.cmake -* CMake/UseJavaSymlinks.cmake - Copyright 2010-2011 Andreas schneider <asn@redhat.com> - BSD 3-Clause license - https://opensource.org/licenses/BSD-3-Clause - - * CMake/UseSWIGLocal.cmake Copyright 2004-2009 Kitware, Inc. Copyright 2009 Mathieu Malaterre <mathieu.malaterre@gmail.com> diff --git a/Packaging/CMakeLists.txt b/Packaging/CMakeLists.txt index ca735ac2a31163959094441a3163fc86f3f2a9d3..18b1b9fc8b6526fc428792bf663d1a974a771ee9 100644 --- a/Packaging/CMakeLists.txt +++ b/Packaging/CMakeLists.txt @@ -136,7 +136,6 @@ include(cleanup_package) include(install_include_dirs) include(install_importlibs) include(install_python_bindings) -include(install_java_bindings) include(install_share_dirs) include(install_cmake_files) include(install_qtdev_files) diff --git a/Packaging/install_java_bindings.cmake b/Packaging/install_java_bindings.cmake deleted file mode 100644 index 0c9d9358b042a3f16f7f8b1c2441ff8f421ca41e..0000000000000000000000000000000000000000 --- a/Packaging/install_java_bindings.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES) -# -# This file is part of Orfeo Toolbox -# -# https://www.orfeo-toolbox.org/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -function(install_java_bindings) - if(HAVE_JAVA) - install(FILES ${SUPERBUILD_INSTALL_DIR}/lib/otb/java/org.otb.application.jar - DESTINATION ${PKG_STAGE_DIR}/lib/java - ) - endif() -endfunction() diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake index 556ff87310f79077eb82dfa548106c40c9cf9cd9..d27d88196847396ba6037414ff4f47413b09bf0a 100644 --- a/SuperBuild/CMake/External_otb.cmake +++ b/SuperBuild/CMake/External_otb.cmake @@ -79,7 +79,7 @@ if(OTB_USE_MUPARSERX) ADD_SUPERBUILD_CMAKE_VAR(OTB MUPARSERX_LIBRARY) endif() -if(OTB_WRAP_PYTHON OR OTB_WRAP_JAVA) +if(OTB_WRAP_PYTHON) ADD_SUPERBUILD_CMAKE_VAR(OTB SWIG_EXECUTABLE) ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OTB SWIG) endif() @@ -207,7 +207,6 @@ ExternalProject_Add(OTB -DOTB_USE_OPENMP:BOOL=${OTB_USE_OPENMP} -DOTB_USE_GSL:BOOL=${OTB_USE_GSL} -DOTB_WRAP_PYTHON:BOOL=${OTB_WRAP_PYTHON} - -DOTB_WRAP_JAVA:BOOL=${OTB_WRAP_JAVA} -DOTB_USE_MPI:BOOL=${OTB_USE_MPI} -DOTB_USE_SPTW:BOOL=${OTB_USE_SPTW} -DPYTHON_EXECUTABLE:PATH=${PYTHON_EXECUTABLE} diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index a4d361d3aecbe6c35fd496837d27b1db35070653..4eaa0f1c4a6a6666564b20a23d582338053dfd00 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -350,7 +350,6 @@ find_path(OTB_DATA_ROOT README-OTB-Data # SWIG Wrapping option(OTB_WRAP_PYTHON "Enable python wrappers for OTB applications (requires SWIG)" ON) -option(OTB_WRAP_JAVA "Enable java wrappers for OTB applications (requires SWIG)" OFF) configure_file(${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY)