Merge pull request #2 from kipr/erinQt6Upgrade

Changed CMakeLists.txt to use qt6 instead of qt5, general qt5 -> qt6 …
kipr · Jan 19, 2024 · e0ba467 · e0ba467
2 parents 8731c42 + 6d2604c
commit e0ba467
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 lib
 build
 .DS_Store
+.vscode/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(libkar)
 
 cmake_minimum_required(VERSION 2.8.12)
 
-find_package(Qt5Core REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
 set(INCLUDE ${libkar_SOURCE_DIR}/include)
 set(SRC ${libkar_SOURCE_DIR}/src)
@@ -14,7 +14,7 @@ file(GLOB SOURCES ${SRC}/*.c ${SRC}/*.cpp)
 
 set(LIBRARY_OUTPUT_PATH ${libkar_SOURCE_DIR}/lib)
 add_library(kar SHARED ${SOURCES} ${INCLUDES})
-qt5_use_modules(kar Core)
+target_link_libraries(kar Qt6::Core)
 
 if(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/../prefix)
@@ -35,3 +35,9 @@ add_custom_target(osx_install_names ALL
 endif()
 
 add_subdirectory(tools)
+
+set(CPACK_GENERATOR "DEB")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "KIPR")
+set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local/)
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
+include(CPack)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR})
 
 add_executable(kissarchive kissarchive.cpp)
 target_link_libraries(kissarchive kar)
-qt5_use_modules(kissarchive Core)
+target_link_libraries(kissarchive Qt6::Core)
 
-install(TARGETS kissarchive RUNTIME DESTINATION bin)
+install(TARGETS kissarchive RUNTIME DESTINATION bin)