feedc0de/qmsgpack
1
0
Fork 0
forked from romixlab/qmsgpack
Code Pull Requests Activity

More patches to get it really working with Qt6 and android

Browse Source
This commit is contained in:
0xFEEDC0DE64
2024-06-30 11:33:10 +02:00
parent e24b73a8d6
commit 8f92d3c389
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -6,9 +6,10 @@
project(qmsgpack) project(qmsgpack)
cmake_minimum_required(VERSION 3.1.0) 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_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# build type # build type
if ("${CMAKE_BUILD_TYPE}" MATCHES "^Rel.*") if ("${CMAKE_BUILD_TYPE}" MATCHES "^Rel.*")

16
src/CMakeLists.txt
View File

@@ -6,17 +6,15 @@ if(NOT DEFINED COMPILE_TYPE)
set(COMPILE_TYPE SHARED) set(COMPILE_TYPE SHARED)
endif(NOT DEFINED COMPILE_TYPE) endif(NOT DEFINED COMPILE_TYPE)
find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
add_library(qmsgpack ${COMPILE_TYPE} ${qmsgpack_srcs} ${qmsgpack_headers}) add_library(qmsgpack ${COMPILE_TYPE} ${qmsgpack_srcs} ${qmsgpack_headers})
if (Qt6Core_FOUND) target_link_libraries(qmsgpack PUBLIC
target_link_libraries(qmsgpack Qt6::Core) Qt6::Core
else () Qt6::Gui
target_link_libraries(qmsgpack ${QT_LIBRARIES}) Qt6::Quick
endif () )
if (Qt6Gui_FOUND)
target_link_libraries(qmsgpack Qt6::Gui)
endif ()
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/msgpackcommon.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/msgpackcommon.h.in"