diff --git a/CMakeLists.txt b/CMakeLists.txt index 186c405fcd358a3c1cb2d31841ed6b9ac251b1d9..41e5dd37fe4f615be2c8f6fc810590d9861de111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ IF(OTB_USE_EXTERNAL_LIBLAS) IF(LIBLAS_INCLUDE_DIR) INCLUDE_DIRECTORIES(BEFORE ${LIBLAS_INCLUDE_DIR}) ENDIF(LIBLAS_INCLUDE_DIR) - + FIND_LIBRARY(LIBLAS_LIBRARY NAMES liblas) IF(LIBLAS_LIBRARY) LINK_DIRECTORIES( ${LIBLAS_LIBRARY} ) @@ -348,10 +348,10 @@ IF(OTB_USE_EXTERNAL_GDAL) MESSAGE(STATUS "GDAL version is " ${GDAL_VERSION}) SET(GDAL_VERSION ${GDAL_VERSION} CACHE STRING "GDAL version" FORCE) MARK_AS_ADVANCED(GDAL_VERSION) - ELSE (GDALCONFIG_EXECUTABLE) + ELSE (GDALCONFIG_EXECUTABLE) MESSAGE(STATUS "gdal-config not found") ENDIF (GDALCONFIG_EXECUTABLE) - + # Find geotiff headers FIND_PATH(GEOTIFF_INCLUDE_DIRS geotiff.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} /usr/include/geotiff /usr/include/libgeotiff) @@ -716,7 +716,7 @@ IF(GETTEXT_FOUND) libintl.h DOC "Path to gettext include directory (where libintl.h can be found)") MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR) - + IF(GETTEXT_INCLUDE_DIR) INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR}) ENDIF(GETTEXT_INCLUDE_DIR) @@ -1193,36 +1193,36 @@ MARK_AS_ADVANCED(OTB_USE_CPACK) IF(OTB_USE_CPACK) INCLUDE(InstallRequiredSystemLibraries) - + SET(CPACK_PACKAGE_NAME "OTB" CACHE STRING "Package name") MARK_AS_ADVANCED(CPACK_PACKAGE_NAME) - + SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orfeo Toolbox") MARK_AS_ADVANCED(CPACK_PACKAGE_DESCRIPTION_SUMMARY) - + SET(CPACK_PACKAGE_VERSION "${OTB_VERSION_STRING}") SET(CPACK_PACKAGE_VERSION_MAJOR "${OTB_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${OTB_VERSION_MINOR}") SET(CPACK_PACKAGE_VERSION_PATCH "${OTB_VERSION_PATCH}") - + SET(CPACK_PACKAGE_CONTACT "contact@orfeo-toolbox.org" CACHE STRING "Orfeo toolbox contact email") - + SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Description.txt") - + #Debian specific SET(DEBIAN_PACKAGE_MAINTAINER "debian@orfeo-toolbox.org" CACHE STRING "Debian package maintainer email") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgdal1-1.5.0 (>= 1.5.1-0), libfltk1.1 (>= 1.1.7-3), libcurl3 (>=7.15.5-1etch1), libfftw3-3 (>=3.1.2-3.1)" CACHE STRING "Debian package dependance" ) SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" CACHE STRING "arch") MARK_AS_ADVANCED(CPACK_DEBIAN_PACKAGE_ARCHITECTURE) SET(CPACK_DEBIAN_PACKAGE_NAME "libotb" CACHE STRING "Debian package name") - + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "OrfeoToolbox-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}") - + SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright/OTBCopyright.txt") - + FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_RPM_PACKAGE_DESCRIPTION) FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_DEBIAN_PACKAGE_DESCRIPTION) - + IF(WIN32 AND NOT UNIX AND NOT CYGWIN) #Find gdal dll files, localized in the GDAL_LIBRARY directory GET_FILENAME_COMPONENT(GDAL_LIB_DIR "${GDAL_LIBRARY}" PATH ) @@ -1234,7 +1234,7 @@ IF(OTB_USE_CPACK) DESTINATION lib FILES_MATCHING PATTERN "*.lib" ) ENDIF(WIN32 AND NOT UNIX AND NOT CYGWIN) - + INCLUDE(CPack) ENDIF(OTB_USE_CPACK) diff --git a/Utilities/InsightJournal/foo.cxx b/Utilities/InsightJournal/foo.cxx new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391