From b182e572bc2e7b088aaf00905f428da52608035c Mon Sep 17 00:00:00 2001
From: Mikhail Svetkin <mikhail.svetkin@remarkable.no>
Date: Wed, 16 Mar 2022 10:21:32 +0100
Subject: [PATCH] cmake: Split QtWebApp/CMakeLists into lib cmake and project
 cmake files

That will allow to use QtWebApp as subdirectory with provided Qt version
---
 .github/workflows/build.yml | 4 +---
 CMakeLists.txt              | 6 ++++++
 QtWebApp/CMakeLists.txt     | 4 ----
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 CMakeLists.txt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea12c66..2de468c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,14 +39,12 @@ jobs:
       - name: Build QtWebApp
         run: |
           if [ "${{ matrix.os }}" == "ubuntu-latest" ] && [ "$CC" == "clang" ]; then export LDFLAGS=-fuse-ld=lld; fi
-          pushd QtWebApp
           mkdir build
           pushd build
           cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release ..
           make
           sudo make install
           popd # build
-          popd # QtWebApp
         env:
           CC: ${{ matrix.compiler.cc }}
           CXX: ${{ matrix.compiler.cxx }}
@@ -109,7 +107,7 @@ jobs:
         if: matrix.arch == 'win32_mingw81'
         run: echo "$env:IQTA_TOOLS/mingw810_32/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - run: cmake -S QtWebApp -B build-qtwebapp ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=Release
+      - run: cmake -B build-qtwebapp ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=Release
       - run: cmake --build build-qtwebapp
       - run: cmake --build build-qtwebapp --target install
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d07f3dd
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.1)
+project(QtWebApp CXX)
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED HINTS $ENV{Qt6_DIR} $ENV{Qt5_DIR})
+
+add_subdirectory(QtWebApp)
diff --git a/QtWebApp/CMakeLists.txt b/QtWebApp/CMakeLists.txt
index b682903..5eddd31 100644
--- a/QtWebApp/CMakeLists.txt
+++ b/QtWebApp/CMakeLists.txt
@@ -1,12 +1,8 @@
-cmake_minimum_required(VERSION 3.1)
-project(QtWebApp CXX)
-
 set(qtwebapp_MAJOR 1)
 set(qtwebapp_MINOR 8)
 set(qtwebapp_PATCH 3)
 set(qtwebapp_VERSION ${qtwebapp_MAJOR}.${qtwebapp_MINOR}.${qtwebapp_PATCH})
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED HINTS $ENV{Qt6_DIR} $ENV{Qt5_DIR})
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network REQUIRED)
 
 if (Qt6_FOUND)