From eaebece93ba143cc5db692b4c623f0d8cd84c044 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Tue, 10 Oct 2023 20:46:30 -0700 Subject: [PATCH] packaging miscellanea --- CMakeLists.txt | 15 ++++++++++++++- CMakePack.txt | 9 +++++---- kge.desktop.in | 9 +++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 kge.desktop.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 54bbc25..49db486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,15 @@ project(kge LANGUAGES CXX VERSION 0.0.1) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) +include(FetchContent) +FetchContent_Declare( + klib + GIT_REPOSITORY https://git.wntrmute.dev/kyle/klib + GIT_TAG master + FIND_PACKAGE_ARGS NAMES klib +) +FetchContent_MakeAvailable(klib) + find_package(SDL2 REQUIRED) find_package(OpenGL REQUIRED) find_package(klib REQUIRED) @@ -56,10 +65,14 @@ target_include_directories(imgui PUBLIC include_directories(ext/ ${SDL2_INCLUDE_DIRS} ${KLIB_INCLUDE_DIRS}) +configure_file(kge.desktop.in kge.desktop @ONLY) add_executable(kge kge.cc ) target_link_libraries(kge imgui ${KLIB_LIBRARIES}) -install(TARGETS kge RUNTIME DESTINATION bin) +install(TARGETS kge RUNTIME DESTINATION bin COMPONENT dist) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.desktop + DESTINATION share/applications + COMPONENT dist) include(CMakePack.txt) diff --git a/CMakePack.txt b/CMakePack.txt index 9745da6..72c01e1 100644 --- a/CMakePack.txt +++ b/CMakePack.txt @@ -12,11 +12,12 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "K. Isom") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Kyle's Graphical Editor") set(CPACK_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) set(CPACK_DEBIAN_PACKAGE_DEPENDS - "libc++1 (>= 3.7.0-1)" - "libsdl2-2.0-0" - "libfreetype6 (>= 2.11.1)" +# "libc++12 (>= 3.7.0-1)" + "libsdl2-2.0-0, libfreetype6 (>= 2.11.1)" ) -set(CPACK_DEBIAN_PACKAGE_SECTION devel) +set(CPACK_DEBIAN_PACKAGE_SECTION universe/editors) +set(CPACK_DEB_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_ALL dist) if(LINUX) set(CPACK_GENERATOR "DEB;STGZ;TGZ") diff --git a/kge.desktop.in b/kge.desktop.in new file mode 100644 index 0000000..e2bb20b --- /dev/null +++ b/kge.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Version=@PROJECT_VERSION@ +Name=@PROJECT_NAME@ +Comment=@PROJECT_DESCRIPTION@ +Exec=kge +Icon= +Terminal=false +Categories=Editors \ No newline at end of file