--- Modules/Learning/Applications/app/CMakeLists.txt.orig
+++ Modules/Learning/Applications/app/CMakeLists.txt
@@ -131,4 +131,4 @@
   LINK_LIBRARIES ${${otb-module}_LIBRARIES})
 
 # Mantis-1427 : temporary fix
-add_dependencies(${otb-module}-all otbapp_ImageEnvelope)
\ No newline at end of file
+# add_dependencies(${otb-module}-all otbapp_ImageEnvelope)
\ No newline at end of file


--- CMake/OTBApplicationMacros.cmake.orig
+++ CMake/OTBApplicationMacros.cmake
@@ -42,6 +42,9 @@
    # Remove the usual 'lib' prefix to make it clear it is a plugin
    # and not a shared library to link against
    set_property(TARGET ${APPLICATION_TARGET_NAME} PROPERTY PREFIX "")
+   if (APPLE)
+     set_property(TARGET ${APPLICATION_TARGET_NAME} PROPERTY SUFFIX ".dylib")
+   endif()
 
    # When called from the OTB build system, use OTB_INSTALL_APP_DIR
    if (NOT APPLICATION_INSTALL_PATH AND OTB_INSTALL_APP_DIR)



--- Modules/ThirdParty/6S/src/main.c.orig
+++ Modules/ThirdParty/6S/src/main.c
@@ -108,7 +108,7 @@
 static integer c__9 = 9;
 
 /*<       program ssssss >*/
-/* Main program */ MAIN__()
+int /* Main program */ MAIN__(void)
 {
     /* Initialized data */
 

--- Modules/ThirdParty/6S/src/otb_main6S_program_call_function.c.orig
+++ Modules/ThirdParty/6S/src/otb_main6S_program_call_function.c
@@ -18,7 +18,7 @@
 static integer c__3 = 3;
 
 /*<       program call6Sv1_0b >*/
-/* Main program */ OTB_6S_MAIN__()
+int /* Main program */ OTB_6S_MAIN__(void)
 {
     /* Format strings */
     static char fmt_100[] = "(10x,\002 ----->  atmospheric reflectance :    \