COMP: add OTB_APPLICATION_PATH to OTBConfig.cmake

CMake/OTBConfig.cmake.in

@@ -28,6 +28,7 @@ set(OTB_BUILD_SHARED "@BUILD_SHARED_LIBS@")
 # List of available OTB modules.
 set(OTB_MODULES_ENABLED "@OTB_CONFIG_MODULES_ENABLED@")
 
+set(OTB_APPLICATION_PATH "@OTB_CONFIG_APPLICATION_PATH@")
 
 # Import OTB targets.
 set(OTB_CONFIG_TARGETS_FILE "@OTB_CONFIG_TARGETS_FILE@")
@@ -39,12 +40,6 @@ endif()
 # Load module interface macros.
 include("@OTB_CONFIG_MODULE_API_FILE@")
 
-
-if(OTB_WRAP_PYTHON)
-  set(OTB_PYTHONPATH "@OTB_PYTHONPATH@")
-endif()
-
-
 # Load application macros.
 include(CMakeParseArguments)
 include("@OTB_CONFIG_APPLI_MACROS_FILE@")

CMakeLists.txt

@@ -305,7 +305,12 @@ set(OTB_CONFIG_CODE "
 set(OTB_MODULES_DIR \"${OTB_MODULES_DIR}\")")
 set(OTB_CONFIG_CMAKE_DIR "${OTB_SOURCE_DIR}/CMake")
 set(OTB_USE_FILE "${OTB_CONFIG_CMAKE_DIR}/UseOTB.cmake")
-set(OTB_PYTHONPATH  "${OTB_BINARY_DIR}/${OTB_INSTALL_PYTHON_DIR}")
+if(OTB_WRAP_PYTHON)
+set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
+set(OTB_PYTHONPATH \"${OTB_BINARY_DIR}/${OTB_INSTALL_PYTHON_DIR}\")")
+endif()
+
+set(OTB_CONFIG_APPLICATION_PATH "${OTB_BINARY_DIR}/${OTB_INSTALL_APP_DIR}")
 set(OTB_CONFIG_TARGETS_CONDITION " AND NOT OTB_BINARY_DIR")
 set(OTB_CONFIG_TARGETS_FILE "${OTB_BINARY_DIR}/OTBTargets.cmake")
 set(OTB_CONFIG_MODULE_API_FILE "${OTB_SOURCE_DIR}/CMake/OTBModuleAPI.cmake")
@@ -327,7 +332,11 @@ set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
 set(OTB_MODULES_DIR \"\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/Modules\")")
 set(OTB_USE_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/UseOTB.cmake")
 set(OTB_CONFIG_CMAKE_DIR "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}")
-set(OTB_PYTHONPATH  "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PYTHON_DIR}")
+if(OTB_WRAP_PYTHON)
+set(OTB_CONFIG_CODE "${OTB_CONFIG_CODE}
+set(OTB_PYTHONPATH \"\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PYTHON_DIR}\")")
+endif()
+set(OTB_CONFIG_APPLICATION_PATH "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_APP_DIR}")
 set(OTB_CONFIG_TARGETS_CONDITION "")
 set(OTB_CONFIG_TARGETS_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/OTBTargets.cmake")
 set(OTB_CONFIG_MODULE_API_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/OTBModuleAPI.cmake")

Documentation/Cookbook/CMake/RunApplicationsRstGenerator.sh.cmake.in

 #!/bin/sh
 
 export LD_LIBRARY_PATH=@OTB_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
-export PYTHONPATH=@OTB_INSTALL_PREFIX@/lib:@OTB_PYTHONPATH@:$PYTHONPATH
-export OTB_APPLICATION_PATH=@OTB_INSTALL_PREFIX@/lib/otb/applications
+export PYTHONPATH=@OTB_PYTHONPATH@:$PYTHONPATH
+export OTB_APPLICATION_PATH=@OTB_APPLICATION_PATH@
 @PYTHON_EXECUTABLE@ @CMAKE_SOURCE_DIR@/Scripts/otbGenerateWrappersRstDoc.py