Changeset 804 for trunk/zoo-project/zoo-kernel

Timestamp:

Jan 21, 2017, 12:57:26 PM (8 years ago)

Author:

djay

Message:

Temporary fix for ITK 4.10 and OTB >=5.4.

File:

• trunk/zoo-project/zoo-kernel/configure.ac (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -814 +814 @@
         fi
         OTB_ENABLED="-DUSE_OTB"
+        IVERS="$(echo -e '4.10\n$ITKVERS' | sort -r | head -n1)"
+        if test "$IVERS" == "$ITKVERS"; then
+           ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS"
+        else
+                ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS"
+        fi
+
         if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then 
                 OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
@@ -837 +844 @@
         LDFLAGS="$OTB_LDFLAGS"
         #echo $OTB_LDFLAGS
-        UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
-        if test "$OTBVERS" ==  "$UVERS" ; then 
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
-                                                           [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
-        else
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
-                                                           [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
-        fi
+        #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
+        #if test "$OTBVERS" ==  "$UVERS" ; then 
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
+                        [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
+        #else
+        #       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
+        #                                                  [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
+        #fi
                                                                                 
         LDFLAGS="$LDFLAGS_SAVE"