From 254f28daec3b4cb9eb1f40dcb4ab8dae5042a873 Mon Sep 17 00:00:00 2001 From: Julien Malik <julien.malik@c-s.fr> Date: Mon, 30 Jan 2012 14:38:45 +0100 Subject: [PATCH] ENH: more internal cmake vars marked as advanced --- CMake/ImportGdal.cmake | 2 ++ CMake/ImportGetText.cmake | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake index 5a4f287df7..699a16da84 100644 --- a/CMake/ImportGdal.cmake +++ b/CMake/ImportGdal.cmake @@ -146,6 +146,7 @@ IF(OTB_USE_EXTERNAL_GDAL) ELSE(GDAL_HAS_JPEG) MESSAGE(STATUS " Testing if GDAL has jpeg -- no") FIND_LIBRARY(JPEG_LIBRARY NAMES jpeg jpeg_i PATHS ${OSGEO4W_LIB}) + MARK_AS_ADVANCED(JPEG_LIBRARY) IF (NOT JPEG_LIBRARY) MESSAGE(FATAL_ERROR "Cannot find jpeg library. Please set JPEG_LIBRARY.") @@ -165,6 +166,7 @@ IF(OTB_USE_EXTERNAL_GDAL) MESSAGE(STATUS " Testing if GDAL has OGR -- no") MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}") FIND_LIBRARY(OGR_LIBRARY ogr PATHS) + MARK_AS_ADVANCED(OGR_LIBRARY) IF (NOT OGR_LIBRARY) MESSAGE(FATAL_ERROR "Cannot find ogr library. Please set OGR_LIBRARY.") diff --git a/CMake/ImportGetText.cmake b/CMake/ImportGetText.cmake index cc5119d4de..f61d722e0a 100644 --- a/CMake/ImportGetText.cmake +++ b/CMake/ImportGetText.cmake @@ -6,10 +6,15 @@ MARK_AS_ADVANCED(OTB_USE_GETTEXT) IF(OTB_USE_GETTEXT) FIND_PACKAGE(Gettext) + MARK_AS_ADVANCED(GETTEXT_MSGMERGE_EXECUTABLE) + MARK_AS_ADVANCED(GETTEXT_MSGFMT_EXECUTABLE) + IF(GETTEXT_FOUND) FIND_LIBRARY(GETTEXT_LIBRARY gettextlib DOC "GetText library") + MARK_AS_ADVANCED(GETTEXT_LIBRARY) IF(APPLE OR WIN32) FIND_LIBRARY(GETTEXT_INTL_LIBRARY intl DOC "GetText intl library") + MARK_AS_ADVANCED(GETTEXT_INTL_LIBRARY) ENDIF(APPLE OR WIN32) IF(GETTEXT_LIBRARY) -- GitLab