diff --git a/CI/macos-10.11.6-clang.cmake b/CI/macos-10.11.6-clang.cmake index 7b6f1cc43c9c1bb36a2e2885b57cece503f01417..46b8873673b449dc1d1ed35b2d56f3c6d696a36b 100644 --- a/CI/macos-10.11.6-clang.cmake +++ b/CI/macos-10.11.6-clang.cmake @@ -25,5 +25,6 @@ set(site_option OTB_USE_GLFW=OFF CMAKE_C_COMPILER_LAUNCHER:STRING=ccache CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache +OPENGL_INCLUDE_DIR:STRING=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/OpenGL.framework/Headers OTB_DATA_USE_LARGEINPUT:BOOL=ON") # Large input path are in an environment variable on macOS diff --git a/Modules/ThirdParty/Glew/otb-module-init.cmake b/Modules/ThirdParty/Glew/otb-module-init.cmake index 941796ddbcf119e181f72a33967e1970879c999e..0116eaa3594c3669a20d17ba6f1f8afbe3a7b921 100644 --- a/Modules/ThirdParty/Glew/otb-module-init.cmake +++ b/Modules/ThirdParty/Glew/otb-module-init.cmake @@ -20,6 +20,11 @@ find_package(GLEW REQUIRED) +# FIX: glew-config.cmake import GLEW::GLEW taget but does not necessarily set GLEW_LIBRARY +if(NOT GLEW_LIBRARY) + get_target_property(GLEW_LIBRARY GLEW::GLEW IMPORTED_LOCATION_RELEASE) +endif() + mark_as_advanced(GLEW_INCLUDE_DIR) mark_as_advanced(GLEW_LIBRARY) diff --git a/Modules/Wrappers/SWIG/src/otbApplication.i b/Modules/Wrappers/SWIG/src/otbApplication.i index 3dad94ca9a34c7e787e1565177dc76e3b2614166..a893d7f8139a04e304a69286da9a1fa76701f903 100644 --- a/Modules/Wrappers/SWIG/src/otbApplication.i +++ b/Modules/Wrappers/SWIG/src/otbApplication.i @@ -727,9 +727,11 @@ class ApplicationProxy(object): """ if (name == "thisown"): return self.this.own() - method = Application.__swig_getmethods__.get(name, None) - if method: - return method(self) + + if hasattr(Application, "__swig_getmethods__"): + method = Application.__swig_getmethods__.get(name, None) + if method: + return method(self) key_list = [k.upper() for k in self.GetParametersKeys(True)] if name in key_list: return self.GetParameterValue(name.lower()) @@ -756,9 +758,11 @@ class ApplicationProxy(object): if (name == "progressReportManager"): super().__setattr__(name, value) return - method = Application.__swig_setmethods__.get(name, None) - if method: - return method(self, value) + + if hasattr(Application, "__swig_setmethods__"): + method = Application.__swig_setmethods__.get(name, None) + if method: + return method(self, value) key_list = [k.upper() for k in self.GetParametersKeys(True)] if name in key_list: self.SetParameterValue(name.lower(), value) diff --git a/SuperBuild/CMake/External_curl.cmake b/SuperBuild/CMake/External_curl.cmake index a25d34bd5a6fe06249bfa72686363f85f3806dbf..b9154f92038893dab2f2175a7739fd245add6aa7 100644 --- a/SuperBuild/CMake/External_curl.cmake +++ b/SuperBuild/CMake/External_curl.cmake @@ -32,11 +32,15 @@ if(NOT APPLE AND NOT WIN32) list(APPEND CURL_SB_CONFIG -DCMAKE_USE_OPENSSL:BOOL=ON -DCMAKE_C_FLAGS:STRING=-fPIC) +# Set CURL_CA_PATH to none because openssl in not enabled and CMake generation will fail if +# a CA path is found in auto mode. elseif(APPLE) list(APPEND CURL_SB_CONFIG -DCMAKE_USE_DARWINSSL:BOOL=ON -DHAVE_LIBNETWORK:STRING=0 - -DCMAKE_C_FLAGS:STRING=-fPIC) + -DCMAKE_C_FLAGS:STRING=-fPIC + -DCURL_CA_PATH:STRING=none) + elseif(WIN32) list(APPEND CURL_SB_CONFIG -DCMAKE_USE_WINSSL:BOOL=ON diff --git a/SuperBuild/patches/QT5/qt5-4-fix-qfixed-macx.diff b/SuperBuild/patches/QT5/qt5-4-fix-qfixed-macx.diff new file mode 100644 index 0000000000000000000000000000000000000000..1d874cc94a13b8f1095f6488a70d96a1a86e4ca2 --- /dev/null +++ b/SuperBuild/patches/QT5/qt5-4-fix-qfixed-macx.diff @@ -0,0 +1,9 @@ +--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + }