From 9a045f536f283b9bbf66a2bf578589177bbe03e5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 6 Oct 2017 15:40:02 +0200 Subject: Windows: Define NOMINMAX for every module As of 5.10, windows.h is included by qrandom.h in QtCore. Task-number: PYSIDE-431 Change-Id: I69cc5e3275fba09f1a4990a4e5d37253b4664a95 Reviewed-by: Christian Tismer --- sources/pyside2/PySide2/QtCharts/CMakeLists.txt | 5 ----- sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt | 5 ----- 2 files changed, 10 deletions(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt index 03c07b546..5d6ed6aaf 100644 --- a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt @@ -58,11 +58,6 @@ ${QtCharts_GEN_DIR}/qtcharts_wrapper.cpp ${QtCharts_GEN_DIR}/qtcharts_module_wrapper.cpp ) -# Sanitize windows.h as pulled by gl.h to prevent clashes with QValueAxis::min(), etc. -if (WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX") -endif() - make_path(QtCharts_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt index 4e0aecb62..54809807c 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt @@ -41,11 +41,6 @@ ${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp ${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp ) -# Sanitize windows.h as pulled by gl.h to prevent clashes with QAbstract3dAxis::min(), etc. -if (WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX") -endif() - make_path(QtDataVisualization_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} -- cgit v1.2.3