diff --git a/Modules/Core/Common/include/otbMath.h b/Modules/Core/Common/include/otbMath.h
index b2d540cc92c2075dc0d1d89d4ac5f1b9fc2f4a0d..16339c734dcd34f7d7bb3cb60bed81f94b2f8331 100644
--- a/Modules/Core/Common/include/otbMath.h
+++ b/Modules/Core/Common/include/otbMath.h
@@ -46,16 +46,16 @@ constexpr double CONST_LOG10E   = 0.43429448190325182765; /* log_10 e */
 constexpr double CONST_LN2      = 0.69314718055994530942; /* log_e 2 */
 constexpr double CONST_LN10     = 2.30258509299404568402; /* log_e 10 */
 constexpr double CONST_PI       = 3.14159265358979323846; /* pi */
-constexpr double CONST_PI_2     = 1.57079632679489661923; /* pi/2 */
-constexpr double CONST_PI_4     = 0.78539816339744830962; /* pi/4 */
-constexpr double CONST_PI_8     = 0.39269908169872415481; /* pi/8 */
-constexpr double CONST_1_PI     = 0.31830988618379067154; /* 1/pi */
-constexpr double CONST_2_PI     = 0.63661977236758134308; /* 2/pi */
-constexpr double CONST_2PI      = 6.28318530717958647693; /* 2*pi */
-constexpr double CONST_PI_180   = 0.01745329251994329577; /* pi/180 */
-constexpr double CONST_180_PI   = 57.2957795130823208768; /* 180/pi */
-constexpr double CONST_LNPI     = std::log(CONST_PI);     /* ln(pi)*/
-constexpr double CONST_SQRTPI   = std::sqrt(CONST_PI);    /* sqrt(pi)*/
+constexpr double CONST_PI_2     = CONST_PI / 2.0;         /* pi/2 */
+constexpr double CONST_PI_4     = CONST_PI / 4.0;         /* pi/4 */
+constexpr double CONST_PI_8     = CONST_PI / 8.0;         /* pi/8 */
+constexpr double CONST_1_PI     = 1.0 / CONST_PI;         /* 1/pi */
+constexpr double CONST_2_PI     = 2.0 / CONST_PI;         /* 2/pi */
+constexpr double CONST_2PI      = 2.0 * CONST_PI;         /* 2*pi */
+constexpr double CONST_PI_180   = CONST_PI / 180.0;       /* pi/180 */
+constexpr double CONST_180_PI   = 180.0 / CONST_PI;       /* 180/pi */
+const double     CONST_LNPI     = std::log(CONST_PI);     /* ln(pi)*/
+const double     CONST_SQRTPI   = std::sqrt(CONST_PI);    /* sqrt(pi)*/
 constexpr double CONST_2_SQRTPI = 1.12837916709551257390; /* 2/sqrt(pi) */
 constexpr double CONST_SQRT2    = 1.41421356237309504880; /* sqrt(2) */
 constexpr double CONST_SQRT1_2  = 0.70710678118654752440; /* 1/sqrt(2) */
@@ -73,14 +73,14 @@ constexpr long double CONST_LOG10El   = 0.4342944819032518276511289189166051L; /
 constexpr long double CONST_LN2l      = 0.6931471805599453094172321214581766L; /* log_e 2 */
 constexpr long double CONST_LN10l     = 2.3025850929940456840179914546843642L; /* log_e 10 */
 constexpr long double CONST_PIl       = 3.1415926535897932384626433832795029L; /* pi */
-constexpr long double CONST_PI_2l     = 1.5707963267948966192313216916397514L; /* pi/2 */
-constexpr long double CONST_PI_4l     = 0.7853981633974483096156608458198757L; /* pi/4 */
-constexpr long double CONST_PI_8l     = 0.3926990816987241548078304229099379L; /* pi/8 */
-constexpr long double CONST_2_PIl     = 0.6366197723675813430755350534900574L; /* 2/pi */
+constexpr long double CONST_PI_2l     = CONST_PI / 2.0L;                       /* pi/2 */
+constexpr long double CONST_PI_4l     = CONST_PI / 4.0L;                       /* pi/4 */
+constexpr long double CONST_PI_8l     = CONST_PI / 8.0L;                       /* pi/8 */
+constexpr long double CONST_2_PIl     = 2.0L / CONST_PI;                       /* 2/pi */
 constexpr long double CONST_2_SQRTPIl = 1.1283791670955125738961589031215452L; /* 2/sqrt(pi) */
-constexpr long double CONST_2PIl      = 6.2831853071795864769252867665590058L; /* 2*pi */
-constexpr long double CONST_PI_180l   = 0.0174532925199432957692369076848861L; /* pi/180 */
-constexpr long double CONST_180_PIl   = 57.295779513082320876798154814105170L; /* 180/pi */
+constexpr long double CONST_2PIl      = 2.0L * CONST_PI;                       /* 2*pi */
+constexpr long double CONST_PI_180l   = CONST_PI / 180.0L;                     /* pi/180 */
+constexpr long double CONST_180_PIl   = 180.0L / CONST_PI;                     /* 180/pi */
 // Defined but not used?
 //const long double CONST_LNPIl =     std::log(CONST_PIl);                    /* ln(pi)*/
 //const long double CONST_SQRTPIl =   std::sqrt(CONST_PIl);                   /* sqrt(pi)*/
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 5a3e78257680e4bd19f5b721154dd25f5387f0d5..9e72344d39c0c893f497dc02014010a538ba4b67 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -55,7 +55,7 @@ option(BUILD_STATIC_LIBS "Build with static libraries." OFF)
 option(BUILD_ALWAYS "Always build or install OTB." ON)
 option(WITH_REMOTE_MODULES "Build with specific list of remote modules." OFF)
 option(OTB_USE_OPENMP "use openmp" OFF)
-set(OTB_ADDITIONAL_CACHE "" CACHE STRING "Additional cmake option for OTB -DVAR:TYPE=VALUE ...")
+set(OTB_ADDITIONAL_CACHE "" CACHE STRING "Additional cmake options for OTB with the syntax (semi-colon used as a separator): -D<var>:<type>=<value>;-D<var>:<type>=<value>")
 
 if(APPLE)
   if(POLICY CMP0042)