Commit e9ba7eca authored by Julien Michel's avatar Julien Michel
Browse files

Merge branch 'release-5.6' of https://git.orfeo-toolbox.org/git/otb into release-5.6

parents c479988a 2be29d33
# Find the Google Benchmark library
# Defines:
# GBENCHMARK_INCLUDE_DIR - gbenchmark include directory
# GBENCHMARK_LIBRARY - gbenchmark library file
# GBENCHMARK_FOUND - TRUE if gbenchmark is found
if (GBENCHMARK_INCLUDE_DIR)
#check cache
set(GBENCHMARK_FIND_QUIETLY TRUE)
endif ()
if (NOT GBENCHMARK_INCLUDE_DIR)
find_path(GBENCHMARK_INCLUDE_DIR NAMES benchmark.h PATH_SUFFIXES benchmark)
set(GBENCHMARK_INCLUDE_DIR ${GBENCHMARK_INCLUDE_DIR}/benchmark CACHE PATH "Google.benchmark include direcory")
endif ()
mark_as_advanced(GBENCHMARK_INCLUDE_DIR)
find_library(GBENCHMARK_LIBRARY NAMES benchmark)
mark_as_advanced(GBENCHMARK_LIBRARY)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GBENCHMARK
REQUIRED_VARS GBENCHMARK_LIBRARY GBENCHMARK_INCLUDE_DIR
)
#VERSION_VAR GBENCHMARK_VERSION_STRING
set(GBENCHMARK_LIBRARIES ${GBENCHMARK_LIBRARY})
set(GBENCHMARK_INCLUDE_DIRS ${GBENCHMARK_INCLUDE_DIR})
......@@ -73,7 +73,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
set(OTB_VERSION_MAJOR "5")
set(OTB_VERSION_MINOR "5")
set(OTB_VERSION_MINOR "6")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
......
# Optional components
if (BUILD_TESTING)
set(OTB_Boost_COMPONENTS unit_test_framework)
endif()
find_package (Boost 1.35.0 REQUIRED)
message(STATUS "Looking for boost components: ${OTB_Boost_COMPONENTS}")
find_package ( Boost
1.35.0
COMPONENTS ${OTB_Boost_COMPONENTS}
REQUIRED
)
if (BUILD_TESTING)
find_package (Boost 1.35.0 QUIET
COMPONENTS unit_test_framework)
if (NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
message(STATUS "Boost unit_test_framework not found. Hence otbOGRTests will be skipped")
else()
message(STATUS "Found Boost components: unit_test_framework")
endif()
endif() #BUILD_TESTING
......@@ -64,7 +64,6 @@ set(ossimplugins_SOURCES
)
add_library(otbossimplugins ${ossimplugins_LIBTYPE} ${ossimplugins_SOURCES})
message(STATUS "lib for ossim: ${OTBBoost_LIBRARIES}")
target_link_libraries(otbossimplugins
${OTBBoost_LIBRARIES}
${OTBGDAL_LIBRARIES}
......
......@@ -810,7 +810,7 @@ namespace ossimplugins
// Appart from TopSAR products, there won't be any burst
//records, so this warning is unnecessary
//ossimNotify(ossimNotifyLevel_DEBUG) << "No burst records available in metadata!!\n";
add(theProductKwl, BURST_NUMBER_KEY, "1");
add(theProductKwl, BURST_NUMBER_KEY, ossimString("1"));
BurstRecordType burstRecord;
burstRecord.startLine = add(theProductKwl, BURST_PREFIX, "[0].start_line", 0);
burstRecord.azimuthStartTime = add(theProductKwl, BURST_PREFIX, "[0].azimuth_start_time", getTimeFromFirstNode(imageInformation, "productFirstLineUtcTime"));
......
# cmake_minimum_required(VERSION 2.6)
# SET(CMAKE_MODULE_PATH "${${PROJECT_NAME}_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
otb_module_test()
message(STATUS "UT: ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
#===== find_cots function
include(FindPackageHandleStandardArgs)
function(find_cots NAME inc_file lib_file target)
string(TOLOWER ${NAME} name)
MESSAGE(STATUS "search: ${NAME}/${name} in: VAR=${${NAME}_DIR} $VAR=$ENV{${NAME}_DIR}")
set(THE_ENV "$ENV{${NAME}_DIR}")
# MESSAGE(STATUS "THE_ENV: ${THE_ENV}")
# The root directory
if ((NOT "${${NAME}_DIR}" STREQUAL "") AND EXISTS "${${NAME}_DIR}" AND IS_DIRECTORY "${${NAME}_DIR}")
set(DIR "${${NAME}_DIR}")
# nothing more to do
elseif((NOT "${THE_ENV}" STREQUAL "") AND EXISTS "${THE_ENV}" AND IS_DIRECTORY "${THE_ENV}")
# MESSAGE(STATUS "setting from ${NAME}_DIR: ${THE_ENV}")
set(DIR "${THE_ENV}")
endif()
# MESSAGE(STATUS "DIR: ${DIR}")
set(${NAME}_DIR ${DIR} )
# The include/ dir
find_path(${NAME}_INCLUDE_DIR
NAMES ${inc_file}
HINTS ${DIR}/include
PATHS ${DIR}/include)
# The lib/ dir
find_library(${NAME}_LIBRARY
NAMES ${lib_file}
HINTS ${DIR}/lib
PATHS ${DIR}/lib)
find_package_handle_standard_args(${NAME} DEFAULT_MSG ${NAME}_DIR ${NAME}_LIBRARY ${NAME}_INCLUDE_DIR)
if (FIND_COTS_DEBUG)
message(STATUS "${NAME}_DIR: ${${NAME}_DIR}")
message(STATUS "${NAME}_INCLUDE_DIR: ${${NAME}_INCLUDE_DIR}")
message(STATUS "${NAME}_LIBRARY: ${${NAME}_LIBRARY}")
endif()
if(${NAME}_FOUND)
set(${NAME}_DIR ${${NAME}_DIR} CACHE PATH "Path to ${NAME} root installation directory" FORCE)
set(${NAME}_LIBRARY_DIRS ${${NAME}_DIR}/lib CACHE PATH "Path to ${NAME} libraries" FORCE)
endif()
# set(${NAME}_INCLUDE_DIR ${NAME}_INCLUDE_DIR PARENT_SCOPE)
# set(${NAME}_LIBRARY ${NAME}_LIBRARY PARENT_SCOPE)
set(${NAME}_FOUND ${${NAME}_FOUND} PARENT_SCOPE)
endfunction()
# Common dirs
include_directories(${PROJECT_SOURCE_DIR}/Modules/ThirdParty/OssimPlugins/src/ossim ${OSSIM_INCLUDE_DIR})
#include_directories(${PROJECT_SOURCE_DIR}/Modules/ThirdParty/OssimPlugins/src/ossim ${OSSIM_INCLUDE_DIR})
#==== UT for utilities
add_executable(ossimStringUtilitiesTest ossimStringUtilitiesTest.cpp)
target_link_libraries(ossimStringUtilitiesTest
otbossimplugins
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
otb_module_target_label(ossimStringUtilitiesTest)
otb_add_test(NAME ossimStringUtilitiesTest COMMAND ossimStringUtilitiesTest )
add_executable(ossimTimeUtilitiesTest ossimTimeUtilitiesTest.cpp)
target_link_libraries(ossimTimeUtilitiesTest
# ${OTBOssim_LIBRARIES}
otbossimplugins
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
otb_module_target_label(ossimTimeUtilitiesTest)
otb_add_test(NAME ossimTimeUtilitiesTest COMMAND ossimTimeUtilitiesTest )
if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
add_executable(ossimStringUtilitiesTest ossimStringUtilitiesTest.cpp)
target_link_libraries(ossimStringUtilitiesTest
otbossimplugins
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
otb_module_target_label(ossimStringUtilitiesTest)
otb_add_test(NAME ossimStringUtilitiesTest COMMAND ossimStringUtilitiesTest )
add_executable(ossimTimeUtilitiesTest ossimTimeUtilitiesTest.cpp)
target_link_libraries(ossimTimeUtilitiesTest
# ${OTBOssim_LIBRARIES}
otbossimplugins
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
otb_module_target_label(ossimTimeUtilitiesTest)
otb_add_test(NAME ossimTimeUtilitiesTest COMMAND ossimTimeUtilitiesTest )
else()
message(STATUS "Boost unit test framework not found, ossimStringUtilitiesTest and ossimTimeUtilitiesTest will be skipped.")
endif()
#==== Benchmarking Time conversion
# (requires google.benchmark)
find_cots(GBenchmark benchmark/benchmark.h benchmark "OSSIM Time utilities")
if (GBenchmark_FOUND)
find_package(GBenchmark)
if (GBENCHMARK_FOUND)
add_executable(ossimTimeUtilitiesBench ossimTimeUtilitiesBench.cpp)
include_directories(${GBenchmark_INCLUDE_DIR})
include_directories(${GBENCHMARK_INCLUDE_DIRS})
target_link_libraries(ossimTimeUtilitiesBench
otbossimplugins
${GBenchmark_LIBRARY})
${GBENCHMARK_LIBRARIES})
otb_module_target_label(ossimTimeUtilitiesBench)
else()
message(STATUS "Google.benchmark not found, OSSIM Time utilities benchmarking ignored.")
message(STATUS "Google.benchmark not found, ossimTimeUtilitiesBench will be skipped.")
endif()
......@@ -102,8 +54,6 @@ add_executable(ossimTerraSarXSarSensorModelTest ossimTerraSarXSarSensorModelTest
target_link_libraries(ossimTerraSarXSarSensorModelTest otbossimplugins)
otb_module_target_label(ossimTerraSarXSarSensorModelTest)
#Use ctest
# enable_testing()
otb_add_test(NAME ossimSarSensorModelTest COMMAND ossimSarSensorModelTest )
#S1 tests
......
......@@ -9,7 +9,6 @@
//----------------------------------------------------------------------------
// $Id$
#define private public
#include "ossimSentinel1Model.h"
#include "ossimPluginProjectionFactory.h"
#include <iostream>
......@@ -68,14 +67,7 @@ int main(int argc, char * argv[])
if (verbose)
{
std::map<std::string, std::string> const& kwl = sensor->theProductKwl.getMap();
for (std::map<std::string, std::string>::const_iterator b = kwl.begin(), e = kwl.end()
; b != e
; ++b
)
{
std::clog << "kwl["<<b->first<<"] -> " << b->second << "\n";
}
sensor->print(std::clog);
}
ossimKeywordlist kwl;
......
# Use boost 1.54. There was previously incompatibilities between boost and Qt which leads
# to compilation errors for OTB. We could increase boost version to last stable
# release in future version of superbuild as we've patchedOTB code to
# support both libraries. See the related changeset in OTB trunk:
# http://hg.orfeo-toolbox.org/OTB/r# ev/8da67e36c78d
INCLUDE_ONCE_MACRO(BOOST)
SETUP_SUPERBUILD(BOOST)
option(SUPERBUILD_BOOST_HEADER_ONLY "Only use Boost headers" ON)
mark_as_advanced(SUPERBUILD_BOOST_HEADER_ONLY)
if(UNIX)
if(SUPERBUILD_BOOST_HEADER_ONLY)
ExternalProject_Add(BOOST
PREFIX BOOST
URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
URL_MD5 52dd00be775e689f55a987baebccc462
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
${BOOST_SB_SRC}
)
else()
ExternalProject_Add(BOOST
PREFIX BOOST
URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
URL_MD5 52dd00be775e689f55a987baebccc462
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND
${BOOST_SB_BUILD_DIR}/bootstrap.sh
--prefix=${SB_INSTALL_PREFIX}
--with-libraries=graph,test,regex
BUILD_COMMAND ./b2
INSTALL_COMMAND ./b2 install
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/patches/BOOST/1.54.0
${BOOST_SB_SRC}
)
ExternalProject_Add_Step(BOOST copy_source
COMMAND ${CMAKE_COMMAND} -E copy_directory
${BOOST_SB_SRC} ${BOOST_SB_BUILD_DIR}
DEPENDEES patch update
DEPENDERS configure
)
endif()
elseif(MSVC10)
#TODO: find hash for archives properly
set(BOOST_HEADERS_URL_HASH 1605dc6085cb2dc778ef5ab6c0e59083)
set(BOOST_GRAPH_URL_HASH c246516ca84a3c79ae8a0b22fceb0344)
set(BOOST_REGEX_URL_HASH a3bfc2dc9a3ebe3c050518ecb29d6f8b)
set(BOOST_UTF_URL_HASH 75971963a74c76d32e01974a8e48be11)
#all we loose is one single test from not building boost unit-testing-framework.
#That is single test code. I don't see why we can't use something in-house
#change test code to not use boost unit-testing-framework and all is well.
if(MSVC)
set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2")
set(BOOST_URL_MD5 "65a840e1a0b13a558ff19eeb2c4f0cbe")
else()
set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2")
set(BOOST_URL_MD5 "52dd00be775e689f55a987baebccc462")
endif()
set(BOOST_HEADERS_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_1_50_headers.zip/download")
set(BOOST_GRAPH_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/libboost_graph-vc100-mt-1_50.zip/download")
set(BOOST_UTF_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_unit_test_framework-vc100-mt-1_50.zip/download")
set(BOOST_REGEX_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/libboost_regex-vc100-mt-1_50.zip/download")
ExternalProject_Add(BOOST
PREFIX BOOST
URL "${BOOST_URL}"
URL_MD5 ${BOOST_URL_MD5}
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
${BOOST_SB_SRC}
)
ExternalProject_Add(BOOST_HEADERS
PREFIX BOOST/_HEADERS
URL ${BOOST_HEADERS_URL}
URL_MD5 ${BOOST_HEADERS_URL_HASH}
SOURCE_DIR ${BOOST_SB_SRC}/include/boost
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_SB_SRC}/include/ ${SB_INSTALL_PREFIX}/include/
)
set(BOOSTLIBS)
foreach(BOOSTLIB "REGEX" "GRAPH" "UTF")
ExternalProject_Add(BOOST_${BOOSTLIB}
PREFIX BOOST/_${BOOSTLIB}
URL ${BOOST_${BOOSTLIB}_URL}
URL_MD5 ${BOOST_${BOOSTLIB}_URL_HASH}
SOURCE_DIR ${BOOST_SB_SRC}/lib
DEPENDS BOOST_HEADERS
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_SB_SRC}/lib ${SB_INSTALL_PREFIX}/lib
)
list(APPEND BOOSTLIBS BOOST_${BOOSTLIB})
endforeach()
ExternalProject_Add(BOOST
PREFIX BOOST
DOWNLOAD_COMMAND ""
SOURCE_DIR ${BOOST_SB_SRC}
DEPENDS ${BOOSTLIBS}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
message(STATUS " Using Boost SuperBuild version (prebuilt binaries)")
elseif(MSVC14)
if(SUPERBUILD_BOOST_HEADER_ONLY)
ExternalProject_Add(BOOST
PREFIX BOOST
URL "http://sourceforge.net/projects/boost/files/boost/1.60.0/boost_1_60_0.tar.bz2/download"
URL_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
${BOOST_SB_SRC}
)
else()
message(FATAL_ERROR "not build yet")
endif()
endif() #end else MSVC
set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
set(_SB_Boost_LIBRARY_DIR ${SB_INSTALL_PREFIX}/lib)
\ No newline at end of file
......@@ -55,6 +55,36 @@ else()
endif()
#Remove left over or previous installation from install prefix.
#Existing files in install prefix was disturbing a second installation.
#even afer the QT4 directory is removed from build
add_custom_target(QT4-uninstall
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtCore"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtDBus"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtGui"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtNetwork"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtOpenGL"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSql"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtSvg"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtTest"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/include/QtXml"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/mkspecs"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/plugins"
COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/translations"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/libQt*"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/qmake"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/lrelease"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/moc"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/rcc"
COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/uic"
WORKING_DIRECTORY "${SB_INSTALL_PREFIX}"
)
#adding it to dependencies will remove the files when configure QWT
#list(APPEND QT4_DEPENDENCIES QT4-uninstall)
ExternalProject_Add(QT4
PREFIX QT4
URL "http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz"
......@@ -68,28 +98,18 @@ endif()
if(MSVC)
#Q: why this copy here?.
#RK: Because QT4 sucks with qmake -query.
ExternalProject_Add_Step(QT4 copy_specs
COMMAND
${CMAKE_COMMAND} -E copy_directory
${QT4_SB_SRC}/mkspecs ${SB_INSTALL_PREFIX}/mkspecs
DEPENDEES patch update
DEPENDERS configure )
ExternalProject_Add_Step(QT4 _jpeg_lib_name
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/QT4/qjpeghandler.pri
${QT4_SB_SRC}/src/gui/image/
DEPENDEES patch update
DEPENDERS configure )
#Q: why this copy here?.
#RK: Because QT4 sucks with qmake -query.
ExternalProject_Add_Step(QT4 patches
COMMAND ${CMAKE_COMMAND} -E copy_directory
${QT4_SB_SRC}/mkspecs ${SB_INSTALL_PREFIX}/mkspecs
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/QT4/qjpeghandler.pri
${QT4_SB_SRC}/src/gui/image/
DEPENDEES patch update
DEPENDERS configure )
endif()
SUPERBUILD_PATCH_SOURCE(QT4)
SUPERBUILD_PATCH_SOURCE(QT4)
set(_SB_QT_QMAKE_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/qmake)
......@@ -70,9 +70,9 @@ get_filename_component(OTB_SOURCE_DIR ${SUPERBUILD_SOURCE_DIR} PATH)
if(MSVC)
find_program(ZIP_EXECUTABLE zip)
find_program(ZIP_EXECUTABLE 7z)
if(NOT ZIP_EXECUTABLE)
message(FATAL_ERROR "Cannot find zip executable. Please add it to your path")
message(FATAL_ERROR "Cannot find 7z.exe. Please add it to your path")
endif()
endif()
......
......@@ -60,13 +60,13 @@ macro(macro_create_targets_for_package pkg)
else() #Unxies Using SuperBuild
if(ENABLE_MONTEVERDI)
add_custom_target(PACKAGE-${pkg}-check
COMMAND ${CMAKE_COMMAND} --build "." --target install
WORKING_DIRECTORY "${SUPERBUILD_BINARY_DIR}/MVD/build"
COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
DEPENDS MVD
)
else()
else(ENABLE_MONTEVERDI)
add_custom_target(PACKAGE-${pkg}-check
COMMAND ${CMAKE_COMMAND} --build "." --target install
WORKING_DIRECTORY "${SUPERBUILD_BINARY_DIR}/OTB/build"
COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
DEPENDS OTB
)
endif(ENABLE_MONTEVERDI)
endif()
......@@ -90,6 +90,8 @@ macro(macro_create_targets_for_package pkg)
#configure
add_custom_target(PACKAGE-${pkg}-configure
COMMAND ${CMAKE_COMMAND} -E make_directory "${PACKAGE_PROJECT_DIR}/build"
WORKING_DIRECTORY "${PACKAGE_PROJECT_DIR}"
COMMAND ${CMAKE_COMMAND} "-G${CMAKE_GENERATOR}"
"${PACKAGE_PROJECT_DIR}/src"
WORKING_DIRECTORY "${PACKAGE_PROJECT_DIR}/build"
......@@ -108,8 +110,8 @@ macro(macro_create_targets_for_package pkg)
# creation of package is different from windows and unix like
if(WIN32)
add_custom_target(PACKAGE-${pkg}
COMMAND ${ZIP_EXECUTABLE}
"-rq" "${CMAKE_BINARY_DIR}/${archive_name}.zip" "${archive_name}"
COMMAND ${ZIP_EXECUTABLE} "a"
"-ry" "${CMAKE_BINARY_DIR}/${archive_name}.zip" "${archive_name}/*"
WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
DEPENDS PACKAGE-${pkg}-build
COMMENT "Creating ${CMAKE_BINARY_DIR}/${archive_name}.zip"
......
......@@ -203,6 +203,8 @@ function(func_install_xdk_files)
else()
file(GLOB LIB_FILES "${DEPENDENCIES_INSTALL_DIR}/lib/*dll.*")
endif()
func_lisp(LIB_FILES )
install(FILES ${LIB_FILES} DESTINATION ${PKG_STAGE_DIR}/lib )
file(GLOB ITK_EXTRA_DLL_FILES_1 "${DEPENDENCIES_INSTALL_DIR}/bin/libITK*.dll")
......
// boost cstdint.hpp header file ------------------------------------------//
// (C) Copyright Beman Dawes 1999.
// (C) Copyright Jens Mauer 2001
// (C) Copyright John Maddock 2001
// Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// See http://www.boost.org/libs/integer for documentation.
// Revision History
// 31 Oct 01 use BOOST_HAS_LONG_LONG to check for "long long" (Jens M.)
// 16 Apr 01 check LONGLONG_MAX when looking for "long long" (Jens Maurer)
// 23 Jan 01 prefer "long" over "int" for int32_t and intmax_t (Jens Maurer)
// 12 Nov 00 Merged <boost/stdint.h> (Jens Maurer)
// 23 Sep 00 Added INTXX_C macro support (John Maddock).
// 22 Sep 00 Better 64-bit support (John Maddock)
// 29 Jun 00 Reimplement to avoid including stdint.h within namespace boost
// 8 Aug 99 Initial version (Beman Dawes)
#ifndef BOOST_CSTDINT_HPP
#define BOOST_CSTDINT_HPP
//
// Since we always define the INT#_C macros as per C++0x,
// define __STDC_CONSTANT_MACROS so that <stdint.h> does the right
// thing if possible, and so that the user knows that the macros
// are actually defined as per C99.
//
#ifndef __STDC_CONSTANT_MACROS
# define __STDC_CONSTANT_MACROS
#endif
#include <boost/config.hpp>
//
// Note that GLIBC is a bit inconsistent about whether int64_t is defined or not
// depending upon what headers happen to have been included first...
// so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
//
#if defined(BOOST_HAS_STDINT_H) \
&& (!defined(__GLIBC__) \
|| defined(__GLIBC_HAVE_LONG_LONG) \
|| (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
// The following #include is an implementation artifact; not part of interface.
# ifdef __hpux
// HP-UX has a vaguely nice <stdint.h> in a non-standard location
# include <inttypes.h>
# ifdef __STDC_32_MODE__
// this is triggered with GCC, because it defines __cplusplus < 199707L
# define BOOST_NO_INT64_T
# endif
# elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX)
# include <inttypes.h>
# else
# include <stdint.h>
// There is a bug in Cygwin two _C macros
# if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
# undef INTMAX_C
# undef UINTMAX_C
# define INTMAX_C(c) c##LL
# define UINTMAX_C(c) c##ULL
# endif
# endif
#ifdef __QNX__
// QNX (Dinkumware stdlib) defines these as non-standard names.
// Reflect to the standard names.
typedef ::intleast8_t int_least8_t;
typedef ::intfast8_t int_fast8_t;
typedef ::uintleast8_t uint_least8_t;
typedef ::uintfast8_t uint_fast8_t;
typedef ::intleast16_t int_least16_t;
typedef ::intfast16_t int_fast16_t;
typedef ::uintleast16_t uint_least16_t;
typedef ::uintfast16_t uint_fast16_t;
typedef ::intleast32_t int_least32_t;
typedef ::intfast32_t int_fast32_t;