From 187f6caf08a015f3fad67813ca5206cdb826982e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Nov 2017 09:56:52 +0100 Subject: Build QtConcurrent and QtScripttools with MSVC, too Change-Id: I38e8c16c0602b5dbf71dbe3a872630104fabfdb0 Reviewed-by: Alexandru Croitor --- sources/pyside2/CMakeLists.txt | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'sources/pyside2/CMakeLists.txt') diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index c4b97e860..d7d17f27d 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -255,12 +255,7 @@ COLLECT_MODULE_IF_FOUND(PrintSupport essential) COLLECT_MODULE_IF_FOUND(Sql essential) COLLECT_MODULE_IF_FOUND(Network essential) COLLECT_MODULE_IF_FOUND(Test essential) -if(NOT MSVC) - # right now this does not build on windows - COLLECT_MODULE_IF_FOUND(Concurrent essential) -else() - set(DISABLE_QtConcurrent 1) -ENDIF() +COLLECT_MODULE_IF_FOUND(Concurrent essential) if(UNIX AND NOT APPLE) COLLECT_MODULE_IF_FOUND(X11Extras essential) endif() @@ -280,12 +275,7 @@ COLLECT_MODULE_IF_FOUND(Qml opt) COLLECT_MODULE_IF_FOUND(Quick opt) COLLECT_MODULE_IF_FOUND(QuickWidgets opt) COLLECT_MODULE_IF_FOUND(Script opt) -if(NOT MSVC) - # right now this does not build on windows - COLLECT_MODULE_IF_FOUND(ScriptTools opt) -else() - set(DISABLE_QtScriptTools 1) -ENDIF() +COLLECT_MODULE_IF_FOUND(ScriptTools opt) COLLECT_MODULE_IF_FOUND(Svg opt) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) -- cgit v1.2.3