Commit c426f8a7 authored by Bastien Jacquet's avatar Bastien Jacquet
Browse files

Merge branch 'update/macos-PV5' into 'master'

Update OSX superbuild

Merge branch 'update/macos-PV5' into 'master'

Fix issues with packaging PythonQt plugin, and with compiling Qt.

See internal merge request 10

See internal merge request 10
parents 37daef89 d6e62dab
......@@ -17,6 +17,6 @@ install(CODE "
\"\${CMAKE_INSTALL_PREFIX}/VeloView.app\"
\"${install_location}/lib\"
\"${SuperBuild_BINARY_DIR}/paraview/src/paraview-build/lib\"
\"${install_location}/plugins\")
\"${install_location}/Applications/paraview.app/Contents/Plugins\")
"
COMPONENT superbuild)
From 27aa46933bb32a88c310fe5918a49a3f34d65dfe Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 13 Sep 2015 11:55:59 +0100
Subject: [PATCH] Fix El Capitan build.
---
src/gui/painting/qpaintengine_mac.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index 4aa0668..63b646d 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi
}
// Get the color space from the display profile.
- CGColorSpaceRef colorSpace = 0;
- CMProfileRef displayProfile = 0;
- CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile);
- if (err == noErr) {
- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile);
- CMCloseProfile(displayProfile);
- }
+ CGColorSpaceRef colorSpace = CGDisplayCopyColorSpace(displayID);
// Fallback: use generic DeviceRGB
if (colorSpace == 0)
--
2.3.8 (Apple Git-58)
......@@ -12,9 +12,13 @@ if (NOT APPLE AND UNIX)
${SuperBuild_PROJECTS_DIR}/patches/qt.src.3rdparty.webkit.Source.WebKit.pri
<SOURCE_DIR>/src/3rdparty/webkit/Source/WebKit.pri)
elseif (APPLE)
if (NOT DEFINED CMAKE_OSX_SYSROOT OR NOT DEFINED CMAKE_OSX_ARCHITECTURES)
message(FATAL "CMAKE_OSX_SYSROOT or CMAKE_OSX_ARCHITECTURES are not configured")
endif()
list (APPEND qt_options
-sdk ${CMAKE_OSX_SYSROOT}
#-sdk ${CMAKE_OSX_SYSROOT} #corewlan is failing on 10.9 with 10.11 sdk
-arch ${CMAKE_OSX_ARCHITECTURES}
-platform unsupported/macx-clang-libc++
-qt-libpng
-system-zlib
)
......@@ -23,6 +27,11 @@ elseif (APPLE)
#find . -name "*.pro" -exec sed -i -e "s:/Developer/SDKs/:.*:g" {} \;
set (patch_command
PATCH_COMMAND /usr/bin/find . -name "*.pro" -exec sed -i -e "s:/Developer/SDKs/:.*:g" {} +)
add_external_project_step(qt-patch-osx
COMMAND git apply --whitespace=fix ${SuperBuild_PROJECTS_DIR}/patches/qt.elcapitan-macossdk.patch
WORKING_DIRECTORY <SOURCE_DIR>
DEPENDEES patch
DEPENDERS configure)
endif()
set(qt_EXTRA_CONFIGURATION_OPTIONS ""
CACHE STRING "Extra arguments to be passed to Qt when configuring.")
......@@ -37,10 +46,15 @@ add_external_project_or_use_system(
-no-dbus
-nomake demos
-nomake examples
-nomake tests
-nomake tools
-nomake docs
-no-multimedia
-no-openssl
-no-phonon
-no-qt3support
-no-xinerama
-no-script
-no-scripttools
-no-svg
-no-declarative-debug
......@@ -50,7 +64,7 @@ add_external_project_or_use_system(
-qt-libtiff
-qt-zlib
-no-webkit
-xmlpatterns
#-xmlpatterns
-I <INSTALL_DIR>/include
-L <INSTALL_DIR>/lib
${qt_options}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment