optional-qtwebengine-02-87fedd160798e793fe155c693309479b493279b3

commit 87fedd160798e793fe155c693309479b493279b3
Author: Nathan Ho <nathan@snappizz.com>
Date:   Sun Jun 2 01:43:21 2019 -0700

    sclang: Refactor QtCollider CMakeLists

Gbp-Pq: Name optional-qtwebengine-02-87fedd160798e793fe155c693309479b493279b3

diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
index 0fcd01726a8096517e878616fecf105cce563712..31447a42e278550ef47b709124e8630b8e9f066d 100644 (file)
--- a/QtCollider/CMakeLists.txt
+++ b/QtCollider/CMakeLists.txt
@@ -1,37 +1,51 @@
 set(REQUIRED_QT_VERSION 5.7)
+set(QT_WEBENGINE TRUE)
 
-find_package(
-  Qt5 ${REQUIRED_QT_VERSION}
-  COMPONENTS
+set( QT_USE_QTWEBENGINE TRUE ) # TODO: figure out what to do with this
+
+###############################################################################
+# Components and libraries
+
+set(
+  QT_COMPONENTS
   Core
   Widgets
   Network
-  WebEngine
-  WebEngineCore
-  WebEngineWidgets
   PrintSupport
   OpenGL
   Quick
   Qml
   Sql
   Svg
-  REQUIRED
 )
 
 set (QT_COLLIDER_LIBS
-  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebEngineCore Qt5::WebEngineWidgets Qt5::PrintSupport
+  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
   Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
   ${MATH_LIBRARY})
 
+if(QT_WEBENGINE)
+  list(APPEND QT_COMPONENTS WebEngine WebEngineCore WebEngineWidgets)
+  list(APPEND QT_COLLIDER_LIBS Qt5::WebEngineCore Qt5::WebEngineWidgets)
+endif()
+
+find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED)
+
 if (APPLE)
   find_package(Qt5MacExtras)
   mark_as_advanced(Qt5MacExtras_DIR)
   list(APPEND QT_COLLIDER_LIBS Qt5::MacExtras)
 endif()
 
+###############################################################################
+# Debug flags
+
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}  -DQC_DEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}  -DQC_DEBUG")
 
+###############################################################################
+# Source file manifest
+
 set(QT_COLLIDER_DIR ${CMAKE_SOURCE_DIR}/QtCollider)
 
 include_directories( ${QT_COLLIDER_DIR} )
@@ -66,8 +80,6 @@ set( QT_COLLIDER_HDRS
   ${QT_COLLIDER_DIR}/widgets/soundfileview/view.hpp
   ${QT_COLLIDER_DIR}/widgets/QcFileDialog.h
   ${QT_COLLIDER_DIR}/widgets/QcPenPrinter.h
-  ${QT_COLLIDER_DIR}/widgets/QcWebView.h
-  ${QT_COLLIDER_DIR}/widgets/web_page.hpp
   ${QT_COLLIDER_DIR}/widgets/QcWindow.h
   ${QT_COLLIDER_DIR}/layouts/layouts.hpp
   ${QT_COLLIDER_DIR}/layouts/stack_layout.hpp
@@ -123,8 +135,6 @@ set( QT_COLLIDER_SRCS
   ${QT_COLLIDER_DIR}/widgets/soundfileview/cachestream.cpp
   ${QT_COLLIDER_DIR}/widgets/QcFileDialog.cpp
   ${QT_COLLIDER_DIR}/widgets/QcPenPrinter.cpp
-  ${QT_COLLIDER_DIR}/widgets/QcWebView.cpp
-  ${QT_COLLIDER_DIR}/widgets/web_page.cpp
   ${QT_COLLIDER_DIR}/layouts/layouts.cpp
   ${QT_COLLIDER_DIR}/layouts/stack_layout.cpp
   ${QT_COLLIDER_DIR}/style/ProxyStyle.cpp
@@ -136,8 +146,18 @@ if(QT_COLLIDER_LANG_CLIENT)
     list(APPEND QT_COLLIDER_SRCS ${QT_COLLIDER_DIR}/LanguageClient.cpp)
 endif()
 
+if(QT_WEBENGINE)
+  list(APPEND QT_COLLIDER_HDRS
+    ${QT_COLLIDER_DIR}/widgets/QcWebView.h
+    ${QT_COLLIDER_DIR}/widgets/web_page.hpp
+  )
+  list(APPEND QT_COLLIDER_SRCS
+    ${QT_COLLIDER_DIR}/widgets/QcWebView.cpp
+    ${QT_COLLIDER_DIR}/widgets/web_page.cpp
+  )
+endif()
 
-set( QT_USE_QTWEBENGINE TRUE )
+###############################################################################
 
 qt5_wrap_cpp( QT_COLLIDER_MOC_SRCS ${QT_COLLIDER_HDRS} )
 qt5_add_resources( QT_COLLIDER_RCC ${QT_COLLIDER_DIR}/resources.qrc )