Commits (17)
......@@ -40,7 +40,27 @@ endif ()
superbuild_detect_64bit_target()
option(BUILD_SHARED_LIBS "Enable shared libraries" ON)
# Setup shared library defaults. If explicitly specified somehow, then default
# to that. Otherwise base the default on whether or not shared libs are even
# supported.
get_property(superbuild_shared_libs_supported
GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
cmake_dependent_option(BUILD_SHARED_LIBS
"Build shared libraries (so/dylib/dll)." "${superbuild_shared_libs_supported}"
"superbuild_shared_libs_supported" OFF)
mark_as_advanced(BUILD_SHARED_LIBS)
# Setup PIC defaults.
cmake_dependent_option(CMAKE_POSITION_INDEPENDENT_CODE
"Build with Position Independent Code" ON
"superbuild_shared_libs_supported" OFF)
mark_as_advanced(CMAKE_POSITION_INDEPENDENT_CODE)
# Verify shared libs and PIC compatibility
if(BUILD_SHARED_LIBS AND NOT CMAKE_POSITION_INDEPENDENT_CODE)
message(WARNING "Forcing CMAKE_POSITION_INDEPENDENT_CODE to be ON as required by BUILD_SHARED_LIBS.")
set_property(CACHE CMAKE_POSITION_INDEPENDENT_CODE PROPERTY VALUE ON)
endif()
#-----------------------------------------------------------------------------
# Setup some standard variables that control various locations and flags.
......@@ -61,6 +81,9 @@ set(superbuild_download_location "${CMAKE_BINARY_DIR}/downloads"
CACHE PATH "Location for downloaded source tarballs")
mark_as_advanced(superbuild_download_location)
if(BUILD_SHARED_LIBS AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
string(APPEND superbuild_ld_flags " -shared-intel")
endif()
superbuild_setup_flags()
# merge in default/user-specified CMake flags.
......
......@@ -4,17 +4,15 @@ set_property(GLOBAL PROPERTY
include(CMakeParseArguments)
if (UNIX AND NOT APPLE)
if (NOT superbuild_python_executable)
find_package(PythonInterp 2.7)
if (PYTHONINTERP_FOUND)
set(superbuild_python_executable
"${PYTHON_EXECUTABLE}")
else ()
message(FATAL_ERROR
"Could not find a Python executable newer than 2.7; one is required "
"to create packages on Linux.")
endif ()
if (NOT superbuild_python_executable)
find_package(PythonInterp 2.7)
if (PYTHONINTERP_FOUND)
set(superbuild_python_executable
"${PYTHON_EXECUTABLE}")
else ()
message(FATAL_ERROR
"Could not find a Python executable newer than 2.7; one is required "
"to create packages on Linux and Windows.")
endif ()
endif ()
......@@ -913,7 +911,7 @@ function (superbuild_windows_install_python)
foreach (python_module IN LISTS python_modules)
superbuild_windows_install_python_module(\"\${CMAKE_INSTALL_PREFIX}\"
\"\${python_module}\" \"\${module_directories}\" \"bin/Lib${_install_python_MODULE_DESTINATION}\")
\"\${python_module}\" \"\${module_directories}\" \"bin/Lib${_install_python_MODULE_DESTINATION}\")
endforeach ()"
COMPONENT superbuild)
endfunction ()
......@@ -631,7 +631,7 @@ function (superbuild_process_dependencies)
get_property(build_type_options
CACHE "CMAKE_BUILD_TYPE_${project}"
PROPERTY STRINGS)
list(FIND build_type_options "${CMAKE_BUILD_TYPE}" idx)
list(FIND build_type_options "${CMAKE_BUILD_TYPE_${project}}" idx)
if (idx EQUAL "-1")
string(REPLACE ";" ", " build_type_options "${build_type_options}")
message(FATAL_ERROR "CMAKE_BUILD_TYPE_${project} must be one of: ${build_type_options}.")
......
diff -u -Nr -U5 qt-everywhere-src-5.10.1/qtgamepad/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp qt-everywhere-src-5.10.1.btn-trigger-defs/qtgamepad/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp
--- qt-everywhere-src-5.10.1/qtgamepad/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp 2018-02-05 05:13:56.000000000 -0500
+++ qt-everywhere-src-5.10.1.btn-trigger-defs/qtgamepad/src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp 2018-02-23 15:37:43.307466731 -0500
@@ -42,10 +42,23 @@
#include <QtCore/QLoggingCategory>
#include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
#include <QtCore/private/qcore_unix_p.h>
#include <linux/input.h>
+#ifndef BTN_TRIGGER_HAPPY1
+#define BTN_TRIGGER_HAPPY1 0x2c0
+#endif
+#ifndef BTN_TRIGGER_HAPPY2
+#define BTN_TRIGGER_HAPPY2 0x2c1
+#endif
+#ifndef BTN_TRIGGER_HAPPY3
+#define BTN_TRIGGER_HAPPY3 0x2c2
+#endif
+#ifndef BTN_TRIGGER_HAPPY4
+#define BTN_TRIGGER_HAPPY4 0x2c3
+#endif
+
#include <cmath>
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcEGB, "qt.gamepad")
diff -u -Nr -U5 qt-everywhere-src-5.10.1/qtwebengine/src/3rdparty/chromium/ui/events/ozone/gamepad/static_gamepad_mapping.cc qt-everywhere-src-5.10.1.btn-trigger-defs/qtwebengine/src/3rdparty/chromium/ui/events/ozone/gamepad/static_gamepad_mapping.cc
--- qt-everywhere-src-5.10.1/qtwebengine/src/3rdparty/chromium/ui/events/ozone/gamepad/static_gamepad_mapping.cc 2018-02-02 05:39:52.000000000 -0500
+++ qt-everywhere-src-5.10.1.btn-trigger-defs/qtwebengine/src/3rdparty/chromium/ui/events/ozone/gamepad/static_gamepad_mapping.cc 2018-02-23 15:38:47.028427505 -0500
@@ -11,10 +11,26 @@
#include "base/macros.h"
#include "ui/events/ozone/evdev/event_device_info.h"
#include "ui/events/ozone/gamepad/static_gamepad_mapping.h"
#include "ui/events/ozone/gamepad/webgamepad_constants.h"
+#ifndef BTN_TRIGGER_HAPPY1
+#define BTN_TRIGGER_HAPPY1 0x2c0
+#endif
+#ifndef BTN_TRIGGER_HAPPY2
+#define BTN_TRIGGER_HAPPY2 0x2c1
+#endif
+#ifndef BTN_TRIGGER_HAPPY3
+#define BTN_TRIGGER_HAPPY3 0x2c2
+#endif
+#ifndef BTN_TRIGGER_HAPPY4
+#define BTN_TRIGGER_HAPPY4 0x2c3
+#endif
+#ifndef BTN_TRIGGER_HAPPY17
+#define BTN_TRIGGER_HAPPY17 0x2d0
+#endif
+
namespace ui {
typedef bool (*GamepadMapperFunction)(uint16_t key,
uint16_t code,
GamepadEventType* mapped_type,
......@@ -10,3 +10,6 @@ list(APPEND qt5_extra_options
list(APPEND qt5_process_environment PROCESS_ENVIRONMENT PKG_CONFIG_PATH <INSTALL_DIR>/lib/pkgconfig)
include(qt5.common)
superbuild_apply_patch(qt5 btn-trigger-defs
"Handle older kernels without BTN_TRIGGER_HAPPY defines")
......@@ -86,13 +86,13 @@ superbuild_set_revision(qt4
URL "https://www.paraview.org/files/dependencies/qt-everywhere-opensource-src-${qt4_ver}.tar.gz"
URL_MD5 "${qt4_md5}")
set(qt5_ver "5.10.0")
set(qt5_ver "5.10.1")
if (WIN32)
set(qt5_ext "zip")
set(qt5_md5 "db6a623759cdf9399bac95802742e40b")
set(qt5_md5 "60c4ea41950857c65015fb6cffcb2497")
else ()
set(qt5_ext "tar.xz")
set(qt5_md5 "c5e275ab0ed7ee61d0f4b82cd471770d")
set(qt5_md5 "7e167b9617e7bd64012daaacb85477af")
endif ()
superbuild_set_revision(qt5
URL "https://www.paraview.org/files/dependencies/qt-everywhere-src-${qt5_ver}.${qt5_ext}"
......@@ -177,19 +177,19 @@ superbuild_set_revision(tbb
URL_MD5 "${tbb_md5}")
superbuild_set_revision(pytz
URL "http://www.paraview.org/files/dependencies/pytz-2016.10.tar.bz2"
URL "https://www.paraview.org/files/dependencies/pytz-2016.10.tar.bz2"
URL_MD5 88b1d6c50c764579292edce3493c8a3a)
superbuild_set_revision(pythondateutil
URL "http://www.paraview.org/files/dependencies/python-dateutil-2.6.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/python-dateutil-2.6.0.tar.gz"
URL_MD5 6e38f91e8c94c15a79ce22768dfeca87)
superbuild_set_revision(pythonpyparsing
URL "http://www.paraview.org/files/dependencies/pyparsing-2.2.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/pyparsing-2.2.0.tar.gz"
URL_MD5 0214e42d63af850256962b6744c948d9)
superbuild_set_revision(pythoncycler
URL "http://www.paraview.org/files/dependencies/cycler-0.10.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/cycler-0.10.0.tar.gz"
URL_MD5 4cb42917ac5007d1cdff6cccfe2d016b)
superbuild_set_revision(pythonsetuptools
......@@ -199,54 +199,54 @@ superbuild_set_revision(pythonsetuptools
set(mpi4py_ver "3.0.0")
if (WIN32)
superbuild_set_revision(pythonmpi4py
URL "http://www.paraview.org/files/dependencies/mpi4py-${mpi4py_ver}-cp27m-win_amd64.whl"
URL "https://www.paraview.org/files/dependencies/mpi4py-${mpi4py_ver}-cp27m-win_amd64.whl"
URL_MD5 9b95d5644b3d18819a39f4db858756ac)
else ()
superbuild_set_revision(pythonmpi4py
URL "http://www.paraview.org/files/dependencies/mpi4py-${mpi4py_ver}.tar.gz"
URL "https://www.paraview.org/files/dependencies/mpi4py-${mpi4py_ver}.tar.gz"
URL_MD5 bfe19f20cef5e92f6e49e50fb627ee70)
endif ()
superbuild_set_revision(pythonautobahn
URL "http://www.paraview.org/files/dependencies/autobahn-17.10.1.tar.gz"
URL "https://www.paraview.org/files/dependencies/autobahn-17.10.1.tar.gz"
URL_MD5 f8c8d74bf73644719b751e6fb11dc4a3)
superbuild_set_revision(pythonconstantly
URL "http://www.paraview.org/files/dependencies/constantly-15.1.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/constantly-15.1.0.tar.gz"
URL_MD5 f0762f083d83039758e53f8cf0086eef)
superbuild_set_revision(pythonhyperlink
URL "http://www.paraview.org/files/dependencies/hyperlink-17.3.1.tar.gz"
URL "https://www.paraview.org/files/dependencies/hyperlink-17.3.1.tar.gz"
URL_MD5 eaccb9845b559817e838846669cbc68a)
superbuild_set_revision(pythonincremental
URL "http://www.paraview.org/files/dependencies/incremental-17.5.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/incremental-17.5.0.tar.gz"
URL_MD5 602746e0d438e075a5a9e0678140bba2)
superbuild_set_revision(pythontwisted
URL "http://www.paraview.org/files/dependencies/Twisted-17.9.0.tar.bz2"
URL "https://www.paraview.org/files/dependencies/Twisted-17.9.0.tar.bz2"
URL_MD5 6dbedb918f0c7288a4c670f59393ecf8)
superbuild_set_revision(pythontxaio
URL "http://www.paraview.org/files/dependencies/txaio-2.8.2.tar.gz"
URL "https://www.paraview.org/files/dependencies/txaio-2.8.2.tar.gz"
URL_MD5 a20e3431c95896a49fa3ffa84f77cde1)
superbuild_set_revision(pythonwslink
URL "http://www.paraview.org/files/dependencies/wslink-0.1.4.tar.gz"
URL_MD5 6fb2b6b4851ba7658a4ad36de6156eb0)
URL "https://www.paraview.org/files/dependencies/wslink-0.1.7.tar.gz"
URL_MD5 c83ce53da39c84ec578025f36c9b18b0)
superbuild_set_revision(pythonzope
URL "http://www.paraview.org/files/dependencies/Zope-4.0b3.tar.gz"
URL "https://www.paraview.org/files/dependencies/Zope-4.0b3.tar.gz"
URL_MD5 9a63e8c8b614dc6d6944fcbd9c105f45)
superbuild_set_revision(pythonzopeinterface
URL "http://www.paraview.org/files/dependencies/zope.interface-4.4.3.tar.gz"
URL "https://www.paraview.org/files/dependencies/zope.interface-4.4.3.tar.gz"
URL_MD5 8700a4f527c1203b34b10c2b4e7a6912)
superbuild_set_revision(pythonsix
URL "http://www.paraview.org/files/dependencies/six-1.11.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/six-1.11.0.tar.gz"
URL_MD5 d12789f9baf7e9fb2524c0c64f1773f8)
superbuild_set_revision(pythonpygments
URL "http://www.paraview.org/files/dependencies/Pygments-2.2.0.tar.gz"
URL "https://www.paraview.org/files/dependencies/Pygments-2.2.0.tar.gz"
URL_MD5 13037baca42f16917cbd5ad2fab50844)