diff --git a/Documentation/SoftwareGuide/Latex/ContributorList.tex b/Documentation/SoftwareGuide/Latex/ContributorList.tex index 7f4c8c44c4fdea333daee40f27ca677ec842c0ab..dc42ae456a7fc58cc2a8d22e1f1d19ac125f5916 100644 --- a/Documentation/SoftwareGuide/Latex/ContributorList.tex +++ b/Documentation/SoftwareGuide/Latex/ContributorList.tex @@ -2,6 +2,7 @@ Adamo Ferro, Aik Song Chia (CRISP), Alexis Huck (Magellium), Amit Kulkarni, +Andreas Tile (Debian GIS), Angelos Tzotsos, Antonio Valentino, Aur\'elien Bricier (CS), @@ -44,6 +45,7 @@ Patrick Imbo (CS), Remi Cresson (Irstea), Rik Bellens, Romain Garrigues (CS), +Sebastiaan Couwenberg (Debian GIS), S\'ebastien Dinot (CS), S\'ebastien Harasse (CS), St\'ephane Albert (CS), diff --git a/SuperBuild/CMake/External_qt4.cmake b/SuperBuild/CMake/External_qt4.cmake index 55807594e155d94796924917360389e58e2a796c..85b92b28e70076ffb2d336a005a626f9e0f7fa93 100644 --- a/SuperBuild/CMake/External_qt4.cmake +++ b/SuperBuild/CMake/External_qt4.cmake @@ -66,7 +66,7 @@ else() INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND - ${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include -I ${SB_INSTALL_PREFIX}/include/freetype2 + ${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include -I ${SB_INSTALL_PREFIX}/include/freetype2 -no-xrender -no-fontconfig -no-sm DEPENDS ${${proj}_DEPENDENCIES} ) endif() diff --git a/SuperBuild/CMake/Package_Macro.cmake b/SuperBuild/CMake/Package_Macro.cmake index 27c8a4d11cbf754220ca1837d6e879ba25d49bc0..31768df8bb33375720a835a98c1ba9b2c7b943f9 100644 --- a/SuperBuild/CMake/Package_Macro.cmake +++ b/SuperBuild/CMake/Package_Macro.cmake @@ -202,6 +202,12 @@ function(install_common) find_path(GDAL_DATA epsg.wkt ${PACKAGE_INSTALLDIR}/share/gdal) install(DIRECTORY ${GDAL_DATA} DESTINATION ${DATA_DIR}) + ####################### install GeoTIFF data ########################### + install(DIRECTORY ${PACKAGE_INSTALLDIR}/share/epsg_csv DESTINATION ${DATA_DIR}) + + ####################### install OSSIM data ########################### + install(DIRECTORY ${PACKAGE_INSTALLDIR}/share/ossim DESTINATION ${DATA_DIR}) + ####################### install otbcli scripts ###################### file(GLOB CLI_SCRIPTS ${PACKAGE_INSTALLDIR}/bin/otbcli*) foreach(CLI_SCRIPT ${CLI_SCRIPTS})