diff --git a/CMake/OTBModuleMacros.cmake b/CMake/OTBModuleMacros.cmake index 4b6f20161423687471f68dc753a85e341a1e4b05..150ee2b5b36f277dd4b149e6bfd14319995a0cdc 100644 --- a/CMake/OTBModuleMacros.cmake +++ b/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() diff --git a/CTestConfig.cmake b/CTestConfig.cmake index d866c4a78202a552f5741dd771828db44a552819..5e4d028ad0a1fb3c17b85c95575bbcdfef7f10f4 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -1,7 +1,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) \ No newline at end of file +set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Documentation/Cookbook/CTestConfig.cmake b/Documentation/Cookbook/CTestConfig.cmake index 11d287c57cef853ff4db4221e160534660a814c5..4c5367353e56fda293045177242aa849d02e9c40 100644 --- a/Documentation/Cookbook/CTestConfig.cmake +++ b/Documentation/Cookbook/CTestConfig.cmake @@ -1,7 +1,7 @@ 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) diff --git a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py b/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py index 26ba4543546d4534ac128ae76f2212021bfde167..3e306e23d29baa1be7f57db3e64c741714f0f63e 100755 --- a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py +++ b/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 diff --git a/Documentation/SoftwareGuide/CTestConfig.cmake b/Documentation/SoftwareGuide/CTestConfig.cmake index 11d287c57cef853ff4db4221e160534660a814c5..4c5367353e56fda293045177242aa849d02e9c40 100644 --- a/Documentation/SoftwareGuide/CTestConfig.cmake +++ b/Documentation/SoftwareGuide/CTestConfig.cmake @@ -1,7 +1,7 @@ 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) diff --git a/Modules/ThirdParty/Shark/otb-module.cmake b/Modules/ThirdParty/Shark/otb-module.cmake index 5e01d966b45efd3e57381f4bae065560b0b10ba9..f637d4d4b9cf1134a0faa92349700062ea634e5c 100644 --- a/Modules/ThirdParty/Shark/otb-module.cmake +++ b/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() + diff --git a/SuperBuild/CTestConfig.cmake b/SuperBuild/CTestConfig.cmake index fbf334e35a033ee19f4808e14e4745667ec8aaea..69d13e5d5a9632be2f72608e8c95457a69d6c22b 100644 --- a/SuperBuild/CTestConfig.cmake +++ b/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)