More patches to get it really working with Qt6 and android

This commit is contained in:
2024-06-30 11:33:10 +02:00
parent e24b73a8d6
commit 8f92d3c389
2 changed files with 9 additions and 10 deletions

View File

@ -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.*")

View File

@ -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"