reorganize files and fix build.

+ build is split into dist and nox variants.
This commit is contained in:
Kyle Isom 2023-10-11 15:01:48 -07:00
parent a61916206c
commit 70ceadb880
10 changed files with 18 additions and 9 deletions

View File

@ -9,6 +9,8 @@
#define KEPP_FRAME_H #define KEPP_FRAME_H
#include <vector>
#include "Defs.h" #include "Defs.h"
#include "File.h" #include "File.h"

View File

@ -35,7 +35,7 @@ else()
endif() endif()
if(${BUILD_GUI}) if(${BUILD_GUI})
include(imgui.cmake) include(cmake/imgui.cmake)
endif() endif()
##################### #####################
@ -58,17 +58,17 @@ set(SOURCE_FILES
add_executable(ke main.cc ${SOURCE_FILES} ${HEADER_FILES}) add_executable(ke main.cc ${SOURCE_FILES} ${HEADER_FILES})
add_custom_target(manpages) 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 add_custom_command(TARGET manpages COMMAND scdoc < ke.1.scdoc > ke.1
OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/ke.1) OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/ke.1)
add_dependencies(ke manpages) add_dependencies(ke manpages)
if(${BUILD_GUI}) 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}) add_executable(kge gmain.cc ${SOURCE_FILES} ${HEADER_FILES})
target_link_libraries(kge imgui) 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 add_custom_command(TARGET manpages COMMAND scdoc < kge.1.scdoc > kge.1
OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/kge.1) OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/kge.1)
@ -81,19 +81,26 @@ endif()
install(TARGETS ke install(TARGETS ke
DESTINATION bin DESTINATION bin
COMPONENT dist COMPONENT nox) COMPONENT nox)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ke.1 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ke.1
DESTINATION share/man/man1 DESTINATION share/man/man1
COMPONENT dist COMPONENT nox) COMPONENT nox)
if(${BUILD_GUI}) 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 install(TARGETS kge
DESTINATION bin DESTINATION bin
COMPONENT dist nox) COMPONENT nox
COMPONENT dist)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.desktop install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.desktop
DESTINATION share/applications DESTINATION share/applications
COMPONENT dist) COMPONENT dist)
install(FILES kge.png install(FILES resources/kge.png
DESTINATION share/${PROJECT_NAME} DESTINATION share/${PROJECT_NAME}
COMPONENT dist) COMPONENT dist)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.1 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kge.1
@ -101,4 +108,4 @@ if(${BUILD_GUI})
COMPONENT dist) COMPONENT dist)
endif() endif()
include(packaging.cmake) include(cmake/packaging.cmake)

View File

View File

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB