ENH: update ossim version to 1.8.20

SuperBuild/CMake/External_ossim.cmake

@@ -44,80 +44,30 @@ else()
     set(OSSIM_CXX_FLAGS /EHsc)
   endif()
   
-  if(0)
-    # SVN version
-    ExternalProject_Add(ossim_cmakemodules
-      PREFIX ${proj}/_cmakemodules
-      SVN_REPOSITORY "http://svn.osgeo.org/ossim/trunk/ossim_package_support/cmake/CMakeModules"
-      SVN_REVISION -r 23087
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_SOURCE_DIR}/patches/${proj}/OssimUtilities.cmake
-        ${CMAKE_BINARY_DIR}/${proj}/_cmakemodules/src/ossim_cmakemodules)
-      
-    list(APPEND ${proj}_DEPENDENCIES ossim_cmakemodules)
-  
-    ExternalProject_Add(${proj}
-      PREFIX ${proj}
-      SVN_REPOSITORY "http://svn.osgeo.org/ossim/trunk/ossim/"
-      SVN_REVISION -r 23092
-      BINARY_DIR ${OSSIM_SB_BUILD_DIR}
-      INSTALL_DIR ${SB_INSTALL_PREFIX}
-      DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-      CMAKE_CACHE_ARGS
-        -DOSSIM_VERSION:STRING=1.8.18-1
-        -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS}
-        -DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF
-        -DBUILD_OSSIM_APPS:BOOL=OFF
-        -DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF
-        -DINSTALL_ARCHIVE_DIR:STRING=lib
-        -DINSTALL_LIBRARY_DIR:STRING=lib
-        -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH}
-        ${OSSIM_SB_CONFIG}
-      DEPENDS ${${proj}_DEPENDENCIES}
-      CMAKE_COMMAND ${SB_CMAKE_COMMAND}
-      )
-      
-      ExternalProject_Add_Step(${proj} copy_CMakeModules
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_BINARY_DIR}/${proj}/_cmakemodules/src/ossim_cmakemodules ${OSSIM_SB_SRC}/CMakeModules
-        DEPENDEES patch update
-        DEPENDERS configure
-      )
-  else()
-    # archive version
-    ExternalProject_Add(${proj}
-      PREFIX ${proj}
-      URL "https://www.orfeo-toolbox.org/packages/ossim-minimal-r23092.tar.gz"
-      URL_MD5 1bb7247fa490eb4a6e57b3c2e129d587
-      BINARY_DIR ${OSSIM_SB_BUILD_DIR}
-      INSTALL_DIR ${SB_INSTALL_PREFIX}
-      DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-      CMAKE_CACHE_ARGS
-        -DOSSIM_VERSION:STRING=1.8.18-1
-        -DProject_WC_REVISION:STRING=23092
-        -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-        -DCMAKE_BUILD_TYPE:STRING=Release
-        -DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS}
-        -DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF
-        -DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=ON
-        -DBUILD_OSSIM_APPS:BOOL=OFF
-        -DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF
-        -DINSTALL_ARCHIVE_DIR:STRING=lib
-        -DINSTALL_LIBRARY_DIR:STRING=lib
-        -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH}
-        ${OSSIM_SB_CONFIG}
-      PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_SOURCE_DIR}/patches/${proj}/OssimUtilities.cmake
-        ${OSSIM_SB_SRC}/CMakeModules
-      DEPENDS ${${proj}_DEPENDENCIES}
-      CMAKE_COMMAND ${SB_CMAKE_COMMAND}
-      )
-  endif()
+  # archive version
+  ExternalProject_Add(${proj}
+    PREFIX ${proj}
+    URL "https://www.orfeo-toolbox.org/packages/ossim-minimal-r23537.tar.gz"
+    URL_MD5 40f406c0da9cc188092582b3bdb20a80
+    BINARY_DIR ${OSSIM_SB_BUILD_DIR}
+    INSTALL_DIR ${SB_INSTALL_PREFIX}
+    DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
+    CMAKE_CACHE_ARGS
+    -DProject_WC_REVISION:STRING=23537
+    -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
+    -DCMAKE_BUILD_TYPE:STRING=Release
+    -DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS}
+    -DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF
+    -DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=ON
+    -DBUILD_OSSIM_APPS:BOOL=OFF
+    -DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF
+    -DINSTALL_ARCHIVE_DIR:STRING=lib
+    -DINSTALL_LIBRARY_DIR:STRING=lib
+    -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH}
+    ${OSSIM_SB_CONFIG}
+    DEPENDS ${${proj}_DEPENDENCIES}
+    CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${OSSIM_SB_SRC}/ossim
+    )
   
   set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
   if(WIN32)