From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 15 Apr 2018 22:20:34 +0200
Subject: [PATCH] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more
 strict

---
 CMakeLists.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a1f652..eb006d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,25 +5,25 @@ project( libmygpo-qt )
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
 
-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF)
+option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF)
 
 if( NOT BUILD_WITH_QT4 )
-    find_package(Qt5Core QUIET)
-    if( Qt5Core_DIR )
-        set(MYGPO_QT_VERSION_SUFFIX 5)
-
-        macro(qt_wrap_cpp)
-            qt5_wrap_cpp(${ARGN})
-        endmacro()
+    if( MYGPO_BUILD_TESTS )
+        find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG)
+    else()
+        find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG)
     endif()
+    set(MYGPO_QT_VERSION_SUFFIX 5)
+
+    macro(qt_wrap_cpp)
+        qt5_wrap_cpp(${ARGN})
+    endmacro()
 
     # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for
     # Qt5
     set(MYGPO_QT_MAJOR_VERSION "5")
     set(MYGPO_QT4_QJSON_DEP "")
-endif()
-
-if( NOT Qt5Core_DIR )
+else()
     message(STATUS "Could not find Qt5, searching for Qt4 instead...")
     message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported")
     if( MYGPO_BUILD_TESTS )
g</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a6c36f9305d89872ec81ec4d05421bf53c9f55ed'>root</a>/<a href='/guix/log/etc?id=a6c36f9305d89872ec81ec4d05421bf53c9f55ed'>etc</a>/<a href='/guix/log/etc/guix-daemon.service.in?id=a6c36f9305d89872ec81ec4d05421bf53c9f55ed'>guix-daemon.service.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-daemon.service.in?id=a6c36f9305d89872ec81ec4d05421bf53c9f55ed&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-10-23 02:00:26 +0200'>2022-10-23</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=068f1a1905099f32beec9a8c4904efbb4c503981'>etc: systemd services shouldn't ‘RemainAfterExit’.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/guix-daemon.service.in (RemainAfterExit): Don't.
* etc/guix-publish.service.in (RemainAfterExit): Likewise don't.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-10-23 02:00:25 +0200'>2022-10-23</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=0f6ec662f626eb5ff0685a20ca7e153dae7442e6'>etc: Add ‘Restart=always’ to both systemd services.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/guix-daemon.service.in (Restart): ‘Always’ do.
* etc/guix-publish.service.in (Restart): Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-10-23 02:00:00 +0200'>2022-10-23</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=f16d91295a743d43b1604103b1399a621badea8c'>etc: Add ‘OOMPolicy=continue’ to guix-daemon.service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/guix-daemon.service.in (OOMPolicy): Continue.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-07-07 23:54:20 -0400'>2021-07-07</span></td><td><a href='/guix/commit/etc/guix-daemon.service.in?id=4cbe0127a668cbcc64087c5d311308b59d39b104'>guix-install.sh: Prompt for configuring substitutes discovery.</a><span class='msg-avail'>...<span class='msg-tooltip'>Also ensure prompt_yes_no always print the message with a trailing space,
which is more pleasing to the eye.

* etc/guix-daemon.conf.in &lt;--discover=no&gt;: New guix-daemon option.
* etc/guix-daemon.service.in: Likewise.
* etc/init.d/guix-daemon.in: Likewise.
* etc/openrc/guix-daemon.in: Likewise.
* etc/guix-install.sh (configure_substitute_discovery): New procedure.
(sys_enable_guix_daemon): Ask the user whether automatic substitute discovery
should be enabled.  Set the '--discover' argument accordingly.
(prompt_yes_no): Add a trailing space to the message.
(sys_authorize_build_farms): Remove trailing space from the message argument.
* NEWS (Distribution): Add news.
</span></span></td><td>Maxim Cournoyer</td></tr>