diff --git a/Packaging/MacOS/BundleFixing.cmake b/Packaging/MacOS/BundleFixing.cmake deleted file mode 100644 index 1cbb833b417b556b7cca2d80761939e193a39048..0000000000000000000000000000000000000000 --- a/Packaging/MacOS/BundleFixing.cmake +++ /dev/null @@ -1,4 +0,0 @@ - -include(BundleUtilities) -set(BU_CHMOD_BUNDLE_ITEMS ON) -fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/monteverdi2" "" "${CMAKE_INSTALL_PREFIX}/lib/otb") diff --git a/Packaging/MacOS/BundleFixing.cmake.in b/Packaging/MacOS/BundleFixing.cmake.in new file mode 100644 index 0000000000000000000000000000000000000000..50e06f5c61093ad63ee3734a30108f5a09e92cf8 --- /dev/null +++ b/Packaging/MacOS/BundleFixing.cmake.in @@ -0,0 +1,9 @@ +set(APP_LIST @OTB_APPS_NAME_LIST@) + +foreach(APP ${APP_LIST}) + list(APPEND OTB_APPS_LIST_INSTALL ${CMAKE_INSTALL_PREFIX}/lib/otb/applications/${APP}) +endforeach(APP) + +include(BundleUtilities) +set(BU_CHMOD_BUNDLE_ITEMS ON) +fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/monteverdi2" "${OTB_APPS_LIST_INSTALL}" "${CMAKE_INSTALL_PREFIX}/lib/otb") diff --git a/Packaging/MacOS/CMakeLists.txt b/Packaging/MacOS/CMakeLists.txt index 398a0fd203ed259a2179131c0199659c50c28214..0f76c975dac715b4d87f167430d2f6b12c4d6d78 100644 --- a/Packaging/MacOS/CMakeLists.txt +++ b/Packaging/MacOS/CMakeLists.txt @@ -18,5 +18,24 @@ install(FILES qt.conf DESTINATION bin COMPONENT Resources) -install(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake +# Search all the applications available in the OTB build dir +file(GLOB OTB_APPS_LIST ${OTB_DIR}/bin/otbapp_*.dylib) + +# Install the applications +install(FILES ${OTB_APPS_LIST} + DESTINATION lib/otb/applications) + +# Retrieve the name of all the applications available +foreach(APP ${OTB_APPS_LIST}) + string(REPLACE ${OTB_DIR}/bin/ "" APP_NAME ${APP}) + list(APPEND OTB_APPS_NAME_LIST ${APP_NAME}) +endforeach(APP) + +# configure the file to pass the list of available applications +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake + @ONLY) + +#Use the configured file with the list of apps +install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake COMPONENT Runtime) diff --git a/Packaging/MacOS/StartupCommand b/Packaging/MacOS/StartupCommand index 859b5cb9594aeaa814de4ccecdc0ffc4cdc8ad08..359606a73506aa1e4049248f283a83ec8b59e545 100644 --- a/Packaging/MacOS/StartupCommand +++ b/Packaging/MacOS/StartupCommand @@ -7,6 +7,7 @@ RESOURCES="$BUNDLE/Contents/Resources" #echo "RESOURCES: $RESOURCES" export GDAL_DATA=$RESOURCES/share/gdal +export ITK_AUTOLOAD_PATH=$RESSOURCES/lib/otb/applications cd $HOME