From 70ceadb880a73887a13afe104871564a70081616 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Wed, 11 Oct 2023 15:01:48 -0700 Subject: [PATCH] reorganize files and fix build. + build is split into dist and nox variants. --- Buffer.h | 2 ++ CMakeLists.txt | 25 +++++++++++------- imgui.cmake => cmake/imgui.cmake | 0 packaging.cmake => cmake/packaging.cmake | 0 ke.md => docs/ke.md | 0 kge.md => docs/kge.md | 0 kge.desktop.in => resources/kge.desktop.in | 0 kge.png => resources/kge.png | Bin .../install-cmake-debian.sh | 0 .../install-depdendencies.sh | 0 10 files changed, 18 insertions(+), 9 deletions(-) rename imgui.cmake => cmake/imgui.cmake (100%) rename packaging.cmake => cmake/packaging.cmake (100%) rename ke.md => docs/ke.md (100%) rename kge.md => docs/kge.md (100%) rename kge.desktop.in => resources/kge.desktop.in (100%) rename kge.png => resources/kge.png (100%) rename install-cmake-debian.sh => scripts/install-cmake-debian.sh (100%) rename install-depdendencies.sh => scripts/install-depdendencies.sh (100%) diff --git a/Buffer.h b/Buffer.h index bb6a6d0..94b5838 100644 --- a/Buffer.h +++ b/Buffer.h @@ -9,6 +9,8 @@ #define KEPP_FRAME_H +#include + #include "Defs.h" #include "File.h" diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d1b0e2..f55ffcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ else() endif() if(${BUILD_GUI}) -include(imgui.cmake) +include(cmake/imgui.cmake) endif() ##################### @@ -58,17 +58,17 @@ set(SOURCE_FILES add_executable(ke main.cc ${SOURCE_FILES} ${HEADER_FILES}) add_custom_target(manpages) -configure_file(ke.md ke.1.scdoc @ONLY) +configure_file(docs/ke.md ke.1.scdoc @ONLY) add_custom_command(TARGET manpages COMMAND scdoc < ke.1.scdoc > ke.1 OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/ke.1) add_dependencies(ke manpages) if(${BUILD_GUI}) - configure_file(kge.desktop.in kge.desktop @ONLY) + configure_file(resources/kge.desktop.in kge.desktop @ONLY) add_executable(kge gmain.cc ${SOURCE_FILES} ${HEADER_FILES}) target_link_libraries(kge imgui) - configure_file(kge.md kge.1.scdoc @ONLY) + configure_file(docs/kge.md kge.1.scdoc @ONLY) add_custom_command(TARGET manpages COMMAND scdoc < kge.1.scdoc > kge.1 OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/kge.1) @@ -81,19 +81,26 @@ endif() install(TARGETS ke DESTINATION bin - COMPONENT dist COMPONENT nox) + COMPONENT nox) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ke.1 DESTINATION share/man/man1 - COMPONENT dist COMPONENT nox) + COMPONENT nox) if(${BUILD_GUI}) + install(TARGETS ke + DESTINATION bin + COMPONENT dist) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ke.1 + DESTINATION share/man/man1 + COMPONENT dist) install(TARGETS kge DESTINATION bin - COMPONENT dist nox) + COMPONENT nox + COMPONENT dist) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.desktop DESTINATION share/applications COMPONENT dist) - install(FILES kge.png + install(FILES resources/kge.png DESTINATION share/${PROJECT_NAME} COMPONENT dist) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.1 @@ -101,4 +108,4 @@ if(${BUILD_GUI}) COMPONENT dist) endif() -include(packaging.cmake) +include(cmake/packaging.cmake) diff --git a/imgui.cmake b/cmake/imgui.cmake similarity index 100% rename from imgui.cmake rename to cmake/imgui.cmake diff --git a/packaging.cmake b/cmake/packaging.cmake similarity index 100% rename from packaging.cmake rename to cmake/packaging.cmake diff --git a/ke.md b/docs/ke.md similarity index 100% rename from ke.md rename to docs/ke.md diff --git a/kge.md b/docs/kge.md similarity index 100% rename from kge.md rename to docs/kge.md diff --git a/kge.desktop.in b/resources/kge.desktop.in similarity index 100% rename from kge.desktop.in rename to resources/kge.desktop.in diff --git a/kge.png b/resources/kge.png similarity index 100% rename from kge.png rename to resources/kge.png diff --git a/install-cmake-debian.sh b/scripts/install-cmake-debian.sh similarity index 100% rename from install-cmake-debian.sh rename to scripts/install-cmake-debian.sh diff --git a/install-depdendencies.sh b/scripts/install-depdendencies.sh similarity index 100% rename from install-depdendencies.sh rename to scripts/install-depdendencies.sh