Commits (24)
......@@ -1021,6 +1021,7 @@ macro (superbuild_add_project_python _name)
"${superbuild_python_executable}"
setup.py
build
${${_name}_python_build_args}
INSTALL_COMMAND
"${superbuild_python_executable}"
setup.py
......@@ -1028,6 +1029,7 @@ macro (superbuild_add_project_python _name)
--skip-build
--root=<INSTALL_DIR>
${_superbuild_python_args}
${${_name}_python_install_args}
PROCESS_ENVIRONMENT
PYTHONPATH ${_superbuild_python_path})
endmacro ()
--- qt-everywhere-opensource-src-4.8.6/src/gui/painting/qpaintengine_mac.cpp 2014-04-10 14:37:12.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.6.osx-10.12-colorspace/src/gui/painting/qpaintengine_mac.cpp 2017-01-30 15:47:22.000000000 -0500
@@ -337,19 +337,13 @@
CGDisplayErr dErr = CGGetDisplaysWithRect(rect, 1, &displayID, &throwAway);
if (dErr != kCGErrorSuccess)
displayID = CGMainDisplayID();
}
// 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)
colorSpace = CGColorSpaceCreateDeviceRGB();
// Install cleanup routines
......@@ -38,3 +38,39 @@ superbuild_apply_patch(qt4 osx-10.9-modal-dialogs
# Patch for supporing newer Xcode versions.
superbuild_apply_patch(qt4 selection-flags-static_cast
"Fix modal dialog state management for 10.9 and up")
# Query the version of the SDK being used
set(qt4_OSX_SDK_VERSION "" CACHE INTERNAL "")
if(NOT qt4_OSX_SDK_VERSION)
# Use SDK version "macosx" unless another is explicitly chosen
set(sdk "macosx")
if (CMAKE_OSX_SYSROOT)
set(sdk "${CMAKE_OSX_SYSROOT}")
endif ()
execute_process(
COMMAND xcodebuild -sdk "${sdk}" -version SDKVersion
RESULT_VARIABLE res
OUTPUT_VARIABLE sdk_version
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (res)
message(FATAL_ERROR "${CMAKE_OSX_SYSROOT} is not a valid SDK.")
endif ()
if (sdk_version)
message(STATUS "Identified OS X SDK version: ${sdk_version}")
set(qt4_OSX_SDK_VERSION ${sdk_version})
else ()
# If detecting Xcode version failed, set a crazy high version so we default
# to the newest.
set(qt4_OSX_SDK_VERSION 99)
message(WARNING "Failed to detect the SDK version of an installed copy of Xcode, falling back to highest supported version.")
endif ()
endif ()
# Patch for supporting OS X 10.12 and up. See
# https://gist.github.com/ejtttje/7163a9ced64f12ae9444
if (NOT qt4_OSX_SDK_VERSION VERSION_LESS 10.12)
superbuild_apply_patch(qt4 osx-10.12-colorspace
"Update qpaintengine to avoid using classes that were removed in 10.12.")
endif ()
......@@ -10,15 +10,9 @@ superbuild_add_project(hdf5
-DHDF5_BUILD_HL_LIB:BOOL=TRUE
-DHDF5_BUILD_WITH_INSTALL_NAME:BOOL=ON)
if (WIN32)
set(hdf5_cmake_subdir "cmake/hdf5")
else ()
set(hdf5_cmake_subdir "share/cmake/hdf5")
endif ()
superbuild_add_extra_cmake_args(
"-DHDF5_DIR:PATH=<INSTALL_DIR>/${hdf5_cmake_subdir}"
-DHDF5_ROOT:PATH=<INSTALL_DIR>)
-DHDF5_ROOT:PATH=<INSTALL_DIR>
-DHDF5_NO_FIND_PACKAGE_CONFIG_FILE:BOOL=ON)
# HDF5 on Windows installs a zlib that gets found this way; avoid using it.
superbuild_apply_patch(hdf5 no-zlib-config
......
......@@ -46,4 +46,6 @@ else ()
endif ()
superbuild_add_extra_cmake_args(
-DVTK_PYTHON_VERSION:STRING=2.7)
-DPYTHON_EXECUTABLE:FILEPATH=<INSTALL_DIR>/bin/python2.7
-DPYTHON_INCLUDE_DIR:PATH=<INSTALL_DIR>/include/python2.7
-DPYTHON_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/libpython2.7.so)
set(boost_extra_options)
# 8.0 and below unsupported anyways.
if (MSVC90)
if (NOT MSVC_VERSION VERSION_GREATER 1400)
message(FATAL_ERROR "At least Visual Studio 9.0 is required")
elseif (NOT MSVC_VERSION VERSION_GREATER 1500)
set(msvc_ver 9.0)
elseif (MSVC10)
elseif (NOT MSVC_VERSION VERSION_GREATER 1600)
set(msvc_ver 10.0)
elseif (MSVC11)
elseif (NOT MSVC_VERSION VERSION_GREATER 1700)
set(msvc_ver 11.0)
elseif (MSVC12)
elseif (NOT MSVC_VERSION VERSION_GREATER 1800)
set(msvc_ver 12.0)
elseif (MSVC13)
set(msvc_ver 13.0)
elseif (MSVC14)
elseif (NOT MSVC_VERSION VERSION_GREATER 1900)
set(msvc_ver 14.0)
elseif (MSVC15)
set(msvc_ver 15.0)
# This might be wrong for 1.64 and above.
#elseif (NOT MSVC_VERSION VERSION_GREATER 1910)
# set(msvc_ver 15.0) # 14.1?
else ()
message(FATAL_ERROR "Unrecognized MSVC version")
endif ()
......
set(qt4_extra_options)
# Set the silence flag to remove a warning in 2015 that is really an error.
if (MSVC14)
if (NOT MSVC_VERSION VERSION_LESS 1900)
list(APPEND qt4_extra_options
-D _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS)
endif ()
......
......@@ -4,13 +4,15 @@ else ()
set(tbb_archdir ia32)
endif ()
if (MSVC10)
if (NOT MSVC_VERSION VERSION_GREATER 1500)
message(FATAL_ERROR "At least Visual Studio 10.0 is required")
elseif (NOT MSVC_VERSION VERSION_GREATER 1600)
set(tbb_vsdir vc10)
elseif (MSVC11)
elseif (NOT MSVC_VERSION VERSION_GREATER 1700)
set(tbb_vsdir vc11)
elseif (MSVC12)
elseif (NOT MSVC_VERSION VERSION_GREATER 1800)
set(tbb_vsdir vc12)
else ()
elseif (tbb_enabled)
message(FATAL_ERROR "tbb does not support your Visual Studio compiler; please use a system version.")
endif ()
......