Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fixed several runtime path problems, and deprecated finite() problem common with prior version. - Use later version of Boost, 1.76
- Loading branch information
1 parent
92cadfc
commit 68694cb
Showing
7 changed files
with
175 additions
and
164 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| --- CMakeLists.txt.orig 2022-02-09 13:12:54.000000000 -0600 | ||
| +++ CMakeLists.txt 2022-02-09 13:16:20.000000000 -0600 | ||
| @@ -16,7 +16,7 @@ | ||
| endif() | ||
|
|
||
| if(APPLE) | ||
| - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") | ||
| + #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") | ||
| if (MAC_SELF_CONTAINED_BUNDLE) | ||
| set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/lib) | ||
| set(CMAKE_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/include ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/bin) | ||
| @@ -425,12 +425,12 @@ | ||
| ENDIF() | ||
|
|
||
| # Check for OpenMP | ||
| -IF(APPLE) | ||
| +#IF(APPLE) | ||
| #we need a special search routine for mac, see changes in file CMakeModules/FindOpenMPMac.cmake | ||
| - FIND_PACKAGE(OpenMPMac) | ||
| -ELSE() | ||
| - FIND_PACKAGE(OpenMP) | ||
| -ENDIF() | ||
| + #FIND_PACKAGE(OpenMPMac) | ||
| +#ELSE() | ||
| + set(OPENMP_FOUND FALSE) | ||
| +#ENDIF() | ||
| IF(OPENMP_FOUND) | ||
| MESSAGE(STATUS "Compiler supports OpenMP. Activating support for it.") | ||
| ADD_COMPILE_OPTIONS(${OpenMP_CXX_FLAGS}) | ||
| @@ -559,13 +559,13 @@ | ||
| SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++") | ||
| # setup bundle install prefix | ||
| IF (NOT MAC_SELF_CONTAINED_BUNDLE) | ||
| - IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") | ||
| + IF (MACPORTS) | ||
| # MacPorts | ||
| SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") | ||
| - ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") | ||
| + ELSE(MACPORTS) | ||
| # fink or other custom system. | ||
| SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") | ||
| - ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") | ||
| + ENDIF(MACPORTS) | ||
| MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location") | ||
| ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) | ||
| ENDIF (APPLE) | ||
| @@ -973,4 +973,3 @@ | ||
|
|
||
| ADD_CUSTOM_TARGET(uninstall | ||
| "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") | ||
| - |
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,16 @@ | ||
| --- ./src/hugin1/hugin/PanoPanel.cpp.orig 2022-02-08 13:38:30.000000000 -0600 | ||
| +++ ./src/hugin1/hugin/PanoPanel.cpp 2022-02-08 13:33:13.000000000 -0600 | ||
| @@ -1271,7 +1271,7 @@ | ||
| return; | ||
| }; | ||
|
|
||
| -#if defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE | ||
| +#if defined __WXMAC__ | ||
| wxString cmd = MacGetPathToMainExecutableFileOfRegisteredBundle(CFSTR("net.sourceforge.hugin.PTBatcherGUI")); | ||
| if(cmd != wxT("")) | ||
| { | ||
| @@ -1786,4 +1786,3 @@ | ||
| } | ||
|
|
||
| IMPLEMENT_DYNAMIC_CLASS(PanoPanelXmlHandler, wxXmlResourceHandler) | ||
| - |
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,23 @@ | ||
| --- src/foreign/levmar/compiler.h.orig 2010-12-02 04:30:11.000000000 -0600 | ||
| +++ src/foreign/levmar/compiler.h 2022-02-03 08:12:52.000000000 -0600 | ||
| @@ -20,6 +20,8 @@ | ||
| #ifndef _COMPILER_H_ | ||
| #define _COMPILER_H_ | ||
|
|
||
| +#include <math.h> | ||
| + | ||
| /* note: intel's icc defines both __ICC & __INTEL_COMPILER. | ||
| * Also, some compilers other than gcc define __GNUC__, | ||
| * therefore gcc should be checked last | ||
| @@ -33,9 +35,9 @@ | ||
| #ifdef _MSC_VER | ||
| #define LM_FINITE _finite // MSVC | ||
| #elif defined(__ICC) || defined(__INTEL_COMPILER) || defined(__GNUC__) | ||
| -#define LM_FINITE finite // ICC, GCC | ||
| +#define LM_FINITE isfinite // ICC, GCC | ||
| #else | ||
| -#define LM_FINITE finite // other than MSVC, ICC, GCC, let's hope this will work | ||
| +#define LM_FINITE isfinite // other than MSVC, ICC, GCC, let's hope this will work | ||
| #endif | ||
|
|
||
| #ifdef _MSC_VER |
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,22 @@ | ||
| --- src/hugin1/hugin/huginApp.cpp.orig 2022-02-09 09:04:40.000000000 -0600 | ||
| +++ src/hugin1/hugin/huginApp.cpp 2022-02-09 12:11:51.000000000 -0600 | ||
| @@ -205,6 +205,19 @@ | ||
| // display always the file type list | ||
| wxSystemOptions::SetOption(wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES, 1); | ||
| #endif | ||
| +#ifdef MACPORTS | ||
| + // On macOS when Hugin.app is run from an application bundle the environment | ||
| + // path doesn't inherit from the user and is set to something very limiting. | ||
| + // Append the standard MacPorts bin location so functions like cpfind can be | ||
| + // found. The environment path gets used in AutoCtrlPointCreator.cpp method | ||
| + // AutoCtrlPointCreator::automatch(...). | ||
| + #define MACPORTS_BIN_PATH "/opt/local/bin" /* Portfile may adjust */ | ||
| + wxString env_path; | ||
| + wxGetEnv("PATH", &env_path); | ||
| + env_path += ":"; | ||
| + env_path += MACPORTS_BIN_PATH; | ||
| + wxSetEnv("PATH", env_path); | ||
| +#endif | ||
|
|
||
| // register our custom pano tools dialog handlers | ||
| registerPTWXDlgFcn(); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.