Commit cf1cd26c authored by Stéphane Albert's avatar Stéphane Albert
Browse files

MRG: Synchronized rfc-51-mvd_modules with develop.

parents 507cee3c a9108662
......@@ -58,6 +58,9 @@ macro(otb_module_check otb-module _needed_by stack)
foreach(dep IN LISTS OTB_MODULE_${otb-module}_DEPENDS)
otb_module_check(${dep} ${otb-module} "${otb-module};${stack}")
endforeach()
foreach(dep IN LISTS OTB_MODULE_${otb-module}_OPTIONAL_DEPENDS)
otb_module_check(${dep} ${otb-module} "${otb-module};${stack}")
endforeach()
set(check_finished_${otb-module} 1)
endif()
endmacro()
......
......@@ -307,8 +307,8 @@ check_compiler_warning_flags(C_WARNING_FLAGS CXX_WARNING_FLAGS)
# Append OTB warnings to the CMake flags.
# We do not set them in OTB_REQUIRED FLAGS because all project which
# use OTB don't require these flags .
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_WARNING_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNING_FLAGS}")
set(CMAKE_C_FLAGS "${C_WARNING_FLAGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CXX_WARNING_FLAGS} ${CMAKE_CXX_FLAGS}")
#-----------------------------------------------------------------------------
#Check the set of platform flags the compiler supports
......
......@@ -28,5 +28,10 @@ export OTB_APPLICATION_PATH
# avoid numerical issues caused by locale
export LC_NUMERIC=C
# Source GDAL_DATA, EPSG_CSV
if [ -f $CURRENT_SCRIPT_DIR/env_exports ]; then
. $CURRENT_SCRIPT_DIR/env_exports
fi
# start the application
$OTB_CLI_LAUNCHER "$@"
......@@ -28,5 +28,10 @@ export OTB_APPLICATION_PATH
# avoid numerical issues caused by locale
export LC_NUMERIC=C
# Source GDAL_DATA, EPSG_CSV
if [ -f $CURRENT_SCRIPT_DIR/env_exports ]; then
. $CURRENT_SCRIPT_DIR/env_exports
fi
# start the application
$OTB_GUI_LAUNCHER "$@"
if(WIN32)
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
else()
cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
endif()
cmake_minimum_required(VERSION 2.8.11)
foreach(p
CMP0025 # CMake 3.0
......@@ -411,7 +407,9 @@ endmacro()
message("\n======================= Begin of OTB cmake summary =======================\n")
message( ${OTB_GIT_STATUS_MESSAGE})
if(OTB_GIT_STATUS_MESSAGE)
message( ${OTB_GIT_STATUS_MESSAGE})
endif()
if(OTB_DATA_GIT_STATUS_MESSAGE)
message( ${OTB_DATA_GIT_STATUS_MESSAGE})
endif()
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment