Commit 659f0943 authored by Luc Hermitte's avatar Luc Hermitte

Merge branch 'develop' into dev-sar-s1

Conflicts fixed:
	.travis.yml
	Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
	Modules/Adapters/OSSIMAdapters/src/otbSensorModelAdapter.cxx
	Modules/ThirdParty/Boost/otb-module-init.cmake
	Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
	Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
parents 20962f18 c88b75f5

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
language: cpp
sudo: false
dist: trusty
compiler:
- clang
......@@ -8,21 +9,12 @@ compiler:
addons:
apt:
packages:
- libqt4-dev
- libqtcore4
- libqtgui4
- libboost-all-dev
before_script:
- export MAKE_CMD=/tmp/ninja
- export CMAKE_GEN='Ninja'
- cd /tmp
- wget https://cmake.org/files/v3.4/cmake-3.4.1-Linux-x86_64.tar.gz --no-check-certificate
- tar -xzf cmake-3.4.1-Linux-x86_64.tar.gz
- wget https://github.com/martine/ninja/releases/download/v1.6.0/ninja-linux.zip --no-check-certificate
- unzip ninja-linux.zip
- wget https://www.orfeo-toolbox.org/packages/xdk/OTB-5.2/OTB-5.2.0-xdk-Linux64.run --no-check-certificate
- chmod +x /tmp/OTB-5.2.0-xdk-Linux64.run
- /tmp/OTB-5.2.0-xdk-Linux64.run
cache: ccache
script: /tmp/cmake-3.4.1-Linux-x86_64/bin/ctest -VV -S /home/travis/build/orfeotoolbox/OTB/Utilities/Maintenance/TravisBuild.cmake
branches:
only:
- nightly
script: Utilities/Maintenance/TravisBuild.sh
......@@ -9,7 +9,7 @@
#
IF (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
$ENV{PROGRAMFILES}/GLEW/include
${GLEW_ROOT_DIR}/include
DOC "The directory where GL/glew.h resides")
......@@ -23,7 +23,7 @@ IF (WIN32)
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library")
ELSE (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
/usr/include
/usr/local/include
/sw/include
......@@ -46,10 +46,12 @@ ELSE (WIN32)
ENDIF (WIN32)
SET(GLEW_FOUND "NO")
IF (GLEW_INCLUDE_PATH AND GLEW_LIBRARY)
IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
SET(GLEW_LIBRARIES ${GLEW_LIBRARY})
SET(GLEW_FOUND "YES")
ENDIF (GLEW_INCLUDE_PATH AND GLEW_LIBRARY)
ENDIF ()
INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW DEFAULT_MSG GLEW_LIBRARY)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLEW
REQUIRED_VARS GLEW_LIBRARY GLEW_INCLUDE_DIR
VERSION_VAR GLEW_VERSION_STRING)
......@@ -99,7 +99,7 @@ macro( otb_module_headertest _name )
get_filename_component( _test_name ${_header_test_src} NAME_WE )
add_custom_command(
OUTPUT ${_header_test_src}
COMMAND ${PYTHON_EXECUTABLE} ${OTB_SOURCE_DIR}/Utilities/Maintenance/BuildHeaderTest.py
COMMAND ${PYTHON_EXECUTABLE} ${OTB_CMAKE_DIR}/../Utilities/Maintenance/BuildHeaderTest.py
${_name}
${${_name}_SOURCE_DIR}
${${_name}_BINARY_DIR}
......
......@@ -23,6 +23,11 @@ endif()
if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
find_package(Git)
if(GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%H --oneline
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE OTB_GIT_LAST_COMMIT
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%H
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE OTB_WC_REVISION
......@@ -54,7 +59,7 @@ if(OTB_DATA_ROOT)
mark_as_advanced(OTB_DATA_WC_REVISION)
endif()
endif()
if(EXISTS "${OTB_DATA_ROOT}/.git")
if(NOT GIT_FOUND)
find_package(Git)
......
int main(int argc, char *argv[])
{
int *p = nullptr;
int *p = ITK_NULLPTR;
return 0;
}
......@@ -347,6 +347,8 @@ endif()
# Provide an option for generating documentation.
add_subdirectory(Utilities/Doxygen)
add_subdirectory(Utilities/Completion)
#----------------------------------------------------------------------
# Provide a target to generate the SuperBuild archive (only for Unix)
if(UNIX)
......@@ -362,69 +364,139 @@ endif()
# Create target to download data from the OTBData group. This must come after
# all tests have been added that reference the group, so we put it last.
#macro to put a fixed space between key, value in summary
macro(get_white_spaces var res)
string(LENGTH "${var}" len)
math(EXPR required_spaces "22 - ${len}")
set(${res})
foreach(loop_var RANGE ${required_spaces})
set(${res} "${${res}} ")
endforeach()
endmacro()
message("\n======================= Begin of OTB cmake summary =======================\n")
if(OTB_GIT_LAST_COMMIT)
get_white_spaces("git log -1 --oneline" insert_sp)
message("git log -1 --oneline = [${OTB_GIT_LAST_COMMIT}]")
endif()
set(option_list ${OTB_MODULE_ACTIVATION_OPTION_LIST})
list(SORT option_list)
foreach(otb_option
CMAKE_SOURCE_DIR
CMAKE_BINARY_DIR
CMAKE_INSTALL_PREFIX
CMAKE_COMMAND
CMAKE_C_COMPILER
CMAKE_CXX_COMPILER
CMAKE_MAKE_PROGRAM
CMAKE_GENERATOR
CMAKE_BUILD_TYPE
CMAKE_C_FLAGS
CMAKE_CXX_FLAGS
${option_list}
OTB_WRAP_PYTHON
OTB_WRAP_JAVA
)
get_white_spaces("${otb_option}" spaces)
message("${otb_option} ${spaces} = ${${otb_option}}")
endforeach()