forked from macports/macports-ports
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
orfeotoolbox, py-orfeotoolbox: update to version 9.0.0
- Loading branch information
Showing
6 changed files
with
117 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| --- 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 : \ | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- CMake/OTBSetStandardCompilerFlags.cmake.orig | ||
| +++ CMake/OTBSetStandardCompilerFlags.cmake | ||
| @@ -142,7 +142,6 @@ | ||
| -Wpointer-arith | ||
| -Wunused | ||
| -Wwrite-strings | ||
| - -funit-at-a-time | ||
| -Wno-strict-overflow | ||
| ) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| --- CMakeLists.txt.orig | ||
| +++ CMakeLists.txt | ||
| @@ -121,7 +121,7 @@ | ||
| if(WIN32) | ||
| set(Python_ROOT_DIR "C:/tools/Python37-x64") | ||
| endif() | ||
| - find_package(Python REQUIRED COMPONENTS Interpreter Development) | ||
| + find_package(Python @PYVER@ EXACT REQUIRED COMPONENTS Interpreter Development) | ||
| if(Python_FOUND) | ||
| message(STATUS "Python Library directory : ${Python_LIBRARY_DIRS}") | ||
| message(STATUS "Python Headers directory : ${Python_INCLUDE_DIRS}") | ||
| @@ -90,7 +90,7 @@ | ||
| repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE) | ||
|
|
||
| if(OTB_WRAP_PYTHON) | ||
| - find_package(Python REQUIRED COMPONENTS Interpreter Development) | ||
| + find_package(Python @PYVER@ EXACT REQUIRED COMPONENTS Interpreter Development) | ||
| if(Python_FOUND) | ||
| message(STATUS "Python Library directory : ${Python_LIBRARY_DIRS}") | ||
| message(STATUS "Python Headers directory : ${Python_INCLUDE_DIRS}") |
This file was deleted.
Oops, something went wrong.