From 8f92d3c389f7dfe3f95ca23afcb7ac0ebd483f9e Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Sun, 30 Jun 2024 11:33:10 +0200
Subject: [PATCH] More patches to get it really working with Qt6 and android

---
 CMakeLists.txt     |  3 ++-
 src/CMakeLists.txt | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 981c05e..955f162 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,10 @@
 project(qmsgpack)
 
 cmake_minimum_required(VERSION 3.1.0)
-set (CMAKE_CXX_STANDARD 20)
+#set (CMAKE_CXX_STANDARD 20)
 
 set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # build type
 if ("${CMAKE_BUILD_TYPE}" MATCHES "^Rel.*")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed429dd..6a3c81d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,17 +6,15 @@ if(NOT DEFINED COMPILE_TYPE)
   set(COMPILE_TYPE SHARED)
 endif(NOT DEFINED COMPILE_TYPE)
 
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
+
 add_library(qmsgpack ${COMPILE_TYPE} ${qmsgpack_srcs} ${qmsgpack_headers})
 
-if (Qt6Core_FOUND)
-        target_link_libraries(qmsgpack Qt6::Core)
-else ()
-	target_link_libraries(qmsgpack ${QT_LIBRARIES})
-endif ()
-
-if (Qt6Gui_FOUND)
-        target_link_libraries(qmsgpack Qt6::Gui)
-endif ()
+target_link_libraries(qmsgpack PUBLIC
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Quick
+)
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/msgpackcommon.h.in"