MRG: Synchronize with develop

CMake/OTBModuleMacros.cmake

@@ -326,7 +326,7 @@ macro(otb_module_target _name)
 endmacro()
 
 macro(otb_module_requires_cxx11)
-  if(NOT ${OTB_HAS_CXX11})
-    message(FATAL_ERROR "Module ${otb-module} requires C++11 support. Consider adding --std=c++11 to your compiler flags.")
+  if(${otb-module}_ENABLED AND NOT ${OTB_HAS_CXX11})
+    message(FATAL_ERROR "Module ${otb-module} requires C++11 support. Consider adding --std=c++11 to your compiler flags or disabling it.")
   endif()  
 endmacro()

CTestConfig.cmake

 set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")
-set(CTEST_DROP_SITE_CDASH TRUE)
\ No newline at end of file
+set(CTEST_DROP_SITE_CDASH TRUE)

Documentation/Cookbook/CTestConfig.cmake

 set(CTEST_PROJECT_NAME "Documentation")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=Documentation")
 set(CTEST_DROP_SITE_CDASH TRUE)

Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py

@@ -255,6 +255,55 @@ def ApplicationParametersToRst(app,paramlist,deep = False,current=""):
 
     return output
 
+def ApplicationParametersToRstV2(app,paramlist,deep = False,current=""):
+    output = ""
+    # current level
+    level = 0
+    # First run
+    if len(current)==0:
+        output += "This section describes in details the parameters available for this application. Table [#]_ presents a summary of these parameters and the parameters keys to be used in command-line and programming languages. Application key is *" + app.GetName() + "* ."  + linesep
+        output += GenerateParametersTable(app,paramlist)
+    else:
+        level = len(current.split('.'))
+    indentLevel = level
+    if deep == False:
+        indentLevel += 1
+    # compute prefix
+    bulletStyle = "-*+"
+    prefix = ""
+    if indentLevel > 0:
+        prefix = (' ' * (indentLevel-1)) + bulletStyle[(indentLevel-1)%3] + ' '
+    # find parameter for current param
+    currentlevelparams = []
+    for param in paramlist:
+        if param.startswith(current) and len(param.split('.')) == level+1:
+            currentlevelparams.append(param)
+    if len(currentlevelparams) > 0:
+        output+= linesep
+        for param in currentlevelparams:
+            if app.GetParameterType(param) == otbApplication.ParameterType_Group and level == 0:
+                output+= prefix+"**["+ ConvertString(app.GetParameterName(param))+ "]**"
+            else:
+                output+= prefix+"**"+ ConvertString(app.GetParameterName(param))+ "**"
+            descr =  RstifyDescription(app.GetParameterDescription(param))
+            if len(descr):
+                output+= ": "+descr
+            if app.GetParameterType(param) ==  otbApplication.ParameterType_Choice:
+                output+= " Available choices are: "
+                additionalKeys = []
+                for choiceKey in app.GetChoiceKeys(param):
+                    additionalKeys.append(param+'.'+choiceKey)
+                nextParamList = paramlist + tuple(additionalKeys)
+            else:
+                nextParamList = paramlist
+            output+= linesep
+            ret = ApplicationParametersToRstV2(app,nextParamList,deep,param)
+            if indentLevel == 0 and len(ret)==0:
+                output+= linesep
+            output+= ret
+        output+= linesep
+    return output
+
 def GetApplicationExampleCommandLine(app,idx):
 
     output = "%s%s%s\t%s" % ("::", linesep , linesep, "otbcli_")
@@ -392,7 +441,7 @@ def ApplicationToRst(appname):
     output += RstHeading("Parameters", '-')
     depth = GetParametersDepth(app.GetParametersKeys())
     deep = depth > 0
-    output += ApplicationParametersToRst(app,app.GetParametersKeys(),deep) + linesep
+    output += ApplicationParametersToRstV2(app,app.GetParametersKeys(),deep) + linesep
     if app.GetNumberOfExamples() > 1:
         output += RstHeading("Examples", '-') + linesep
         #output += appdetailslevel + "{Examples}" + "\\label{appexamples:" + appname + "}" + linesep

Documentation/SoftwareGuide/CTestConfig.cmake

 set(CTEST_PROJECT_NAME "Documentation")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=Documentation")
 set(CTEST_DROP_SITE_CDASH TRUE)

Modules/ThirdParty/Shark/otb-module.cmake

@@ -11,6 +11,5 @@ otb_module(OTBShark
 
 otb_module_activation_option("Enable SHARK dependent modules" OFF)
 
-if( OTB_USE_SHARK )
-  otb_module_requires_cxx11()
-endif()
+otb_module_requires_cxx11()
+

SuperBuild/CTestConfig.cmake

@@ -7,7 +7,7 @@
 set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")
 set(CTEST_DROP_SITE_CDASH TRUE)