From 01174223398cd6d7ab5017051711b306fed3eecf Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Fri, 5 Jul 2024 23:59:46 +0200 Subject: [PATCH] Fix include problems with incorrect install step --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 955f162..6fe580d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ if (BUILD_TESTS) add_subdirectory(tests) endif () -install(EXPORT qmsgpack-export DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE MsgPackQtTargets.cmake) +# install(EXPORT qmsgpack-export DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE MsgPackQtTargets.cmake) file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/$CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a3c81d..d98f7c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,6 +10,8 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) add_library(qmsgpack ${COMPILE_TYPE} ${qmsgpack_srcs} ${qmsgpack_headers}) +target_include_directories(qmsgpack PUBLIC .) + target_link_libraries(qmsgpack PUBLIC Qt6::Core Qt6::Gui @@ -30,11 +32,11 @@ set_target_properties(qmsgpack PROPERTIES DEFINE_SYMBOL MSGPACK_MAKE_LIB PUBLIC_HEADER "${qmsgpack_headers}") -install(TARGETS qmsgpack EXPORT qmsgpack-export - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/qmsgpack) +# install(TARGETS qmsgpack EXPORT qmsgpack-export +# LIBRARY DESTINATION ${LIB_INSTALL_DIR} +# RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +# ARCHIVE DESTINATION ${LIB_INSTALL_DIR} +# PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/qmsgpack) -install(FILES ${qmsgpack_stream_headers} DESTINATION ${INCLUDE_INSTALL_DIR}/qmsgpack/stream) +# install(FILES ${qmsgpack_stream_headers} DESTINATION ${INCLUDE_INSTALL_DIR}/qmsgpack/stream)