diff --git a/Modules/Core/Common/otb-module.cmake b/Modules/Core/Common/otb-module.cmake index cefb91fd23aa430d897c6a9f80d37a35ca697cd7..7501fbd86ed582fbd0a201181588071672d0d270 100644 --- a/Modules/Core/Common/otb-module.cmake +++ b/Modules/Core/Common/otb-module.cmake @@ -4,6 +4,8 @@ otb_module(OTBCommon DEPENDS OTBBoost OTBITK + #Add dependency to OTBGDAL as GDAL module need to set OTB_USE_GDAL_20 before configuring otbConfigure.h + OTBGDAL TEST_DEPENDS OTBImageBase diff --git a/Modules/ThirdParty/GDAL/CMakeLists.txt b/Modules/ThirdParty/GDAL/CMakeLists.txt index 940d1565a89cab414df2d208743f6d7e041b4f32..cd42ac614f9086a506dbf5da6de3d9b5ad7f685c 100644 --- a/Modules/ThirdParty/GDAL/CMakeLists.txt +++ b/Modules/ThirdParty/GDAL/CMakeLists.txt @@ -3,7 +3,4 @@ project(OTBGDAL) set(OTBGDAL_SYSTEM_INCLUDE_DIRS ${GDAL_INCLUDE_DIRS}) set(OTBGDAL_LIBRARIES "${GDAL_LIBRARIES}") -set(GDAL_CONFIG_CHECKING ON CACHE BOOL "Tests to check gdal config." FORCE) -mark_as_advanced(GDAL_CONFIG_CHECKING) - otb_module_impl() diff --git a/Modules/ThirdParty/GDAL/otb-module-init.cmake b/Modules/ThirdParty/GDAL/otb-module-init.cmake index 74e86291e8f3c1e468b4d740a83eb3a129a2d218..3d2ae5a52bf54197c3bf8c18490dcbc7c2fe6625 100644 --- a/Modules/ThirdParty/GDAL/otb-module-init.cmake +++ b/Modules/ThirdParty/GDAL/otb-module-init.cmake @@ -8,6 +8,10 @@ if(NOT GDAL_FOUND) message(FATAL_ERROR "Cannot find GDAL. Set GDAL_INCLUDE_DIR and GDAL_LIBRARY") endif() +#Allow to deactivate GDAL checking (done by default) +set(GDAL_CONFIG_CHECKING ON CACHE BOOL "Tests to check gdal config." FORCE) +mark_as_advanced(GDAL_CONFIG_CHECKING) + if(GDAL_CONFIG_CHECKING) set(MIN_MAJOR_VERSION 1) set(MIN_MINOR_VERSION 10) @@ -89,7 +93,7 @@ if(GDAL_CONFIG_CHECKING) file(READ "${TEMP}/gdalVersion.txt" DETECTED_VERSION) string(SUBSTRING ${DETECTED_VERSION} 0 2 VER2) if(${VER2} EQUAL "2.") - message("-- Gdal >= 2.0.0 detected") + message(STATUS "Gdal >= 2.0.0 detected") set(OTB_USE_GDAL_20 true CACHE INTERNAL "True if GDAL >= 2.0.0 has been detected" FORCE ) else(${VER2} EQUAL "2.") set(OTB_USE_GDAL_20 false CACHE INTERNAL "True if GDAL >= 2.0.0 has been detected" FORCE )