ENH: superbuild: use archive mode for ossim and muparserx

SuperBuild/CMake/External_muparserx.cmake

@@ -22,10 +22,10 @@ else()
   
   ExternalProject_Add(${proj}
     PREFIX ${proj}
-    #URL "http://muparserx.googlecode.com/svn/archives/muparserx_v3_0_2.zip"
-    #URL_MD5 487a91084f1929d2fdc9bedee598a77a
-    SVN_REPOSITORY "http://muparserx.googlecode.com/svn/trunk"
-    SVN_REVISION -r 291
+    URL "https://www.orfeo-toolbox.org/packages/muparserx-r291.tar.gz"
+    URL_MD5 4c9b6e222b35dc1a07d24a9506025785
+    #SVN_REPOSITORY "http://muparserx.googlecode.com/svn/trunk"
+    #SVN_REVISION -r 291
     BINARY_DIR ${MUPARSERX_SB_BUILD_DIR}
     INSTALL_DIR ${SB_INSTALL_PREFIX}
     CMAKE_CACHE_ARGS

SuperBuild/CMake/External_ossim.cmake

@@ -38,53 +38,83 @@ else()
   ADD_SUPERBUILD_CMAKE_VAR(OPENTHREADS_INCLUDE_DIR)
   ADD_SUPERBUILD_CMAKE_VAR(OPENTHREADS_LIBRARY)
 
-  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)
-
   set(OSSIM_CXX_FLAGS  -D__STDC_CONSTANT_MACROS)
   
   if(MSVC)
     set(OSSIM_CXX_FLAGS /EHsc)
   endif()
   
-  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}
-    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
-    )  
+  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}
+      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}
+      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_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()
   
   set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
   if(WIN32)