Skip to content
Snippets Groups Projects
Commit 47fab288 authored by Guillaume Pernot's avatar Guillaume Pernot
Browse files

Merge branch 'ci_mojave' into 'develop'

test MacOS mojave on CI

See merge request !664
parents 4229a61e 7a8e18ce
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
--- 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)));
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment