diff --git a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx index 7707ead17102762c4c8a23ceb60833d2e61549d8..87e7dc310fa0cc14efda2c900c0b29942d3feb11 100644 --- a/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx +++ b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx @@ -186,7 +186,7 @@ private: AddDocTag(Tags::Calibration); AddParameter(ParameterType_InputImage, "in", "Input"); - SetParameterDescription("in", "Input image filename (values in DN)"); + SetParameterDescription("in", "Input image filename"); AddParameter(ParameterType_OutputImage, "out", "Output"); SetParameterDescription("out","Output calibrated image filename"); @@ -205,8 +205,8 @@ private: DisableParameter("milli"); MandatoryOff("milli"); - AddParameter(ParameterType_Empty, "clamp", "Clamp of reflectivity values between [0, 100]"); - SetParameterDescription("clamp", "Clamping in the range [0, 100]. It can be useful to preserve area with specular reflectance."); + AddParameter(ParameterType_Empty, "clamp", "Clamp of reflectivity values between [0, 1]"); + SetParameterDescription("clamp", "Clamping in the range [0, 1]. It can be useful to preserve area with specular reflectance."); EnableParameter("clamp"); MandatoryOff("clamp"); diff --git a/SuperBuild/CMake/External_glew.cmake b/SuperBuild/CMake/External_glew.cmake index 3f370e28e0642d584cfbdecfb881fa28d71a07e4..964cd1abce2c7bb5702074aa3440aa256bafff18 100644 --- a/SuperBuild/CMake/External_glew.cmake +++ b/SuperBuild/CMake/External_glew.cmake @@ -30,7 +30,7 @@ ExternalProject_Add(GLEW BINARY_DIR ${GLEW_SB_BUILD_DIR} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} INSTALL_DIR ${SB_INSTALL_PREFIX} - CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} -DBUILD_UTILS:BOOL=OFF ${GLEW_SB_SRC}/build/cmake/ + CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} -DBUILD_UTILS:BOOL=OFF ${GLEW_SB_SRC}/build/cmake/ LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 diff --git a/SuperBuild/CMake/External_glut.cmake b/SuperBuild/CMake/External_glut.cmake index 8894a4931c3619b58bb01125b85494ecf2fbb37c..a4a37ca63ed57d4be316aff66679e7d43e15e1d3 100644 --- a/SuperBuild/CMake/External_glut.cmake +++ b/SuperBuild/CMake/External_glut.cmake @@ -41,7 +41,7 @@ else(MSVC) ${GLUT_SB_SRC} ) - set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} ) + set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} ) endif() ExternalProject_Add(GLUT diff --git a/SuperBuild/CMake/External_jpeg.cmake b/SuperBuild/CMake/External_jpeg.cmake index 25e6de7b872641c8d6b461df6bab1325f1ce522a..ca4ffbe146265fb0693c62ec5805d72b8d30b409 100644 --- a/SuperBuild/CMake/External_jpeg.cmake +++ b/SuperBuild/CMake/External_jpeg.cmake @@ -24,6 +24,7 @@ SETUP_SUPERBUILD(JPEG) if(WIN32) set(JPEG_CONFIGURE_COMMAND "${SB_CMAKE_COMMAND}" + ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} -DENABLE_SHARED=TRUE -DENABLE_STATIC=FALSE