From 3f3a9ee2254875cf62ac4ea7820f82f4df94ea36 Mon Sep 17 00:00:00 2001 From: Dmitriy Gerasimov <naeper@demlabs.net> Date: Sun, 14 Feb 2021 19:22:10 +0700 Subject: [PATCH] [!] Split distr files for .linux and .bsd [*] Changed /opt/cellframe as prefix for all UNIX --- CMakeLists.txt | 10 ++++++++-- {dist => dist.linux}/share/apt/demlabskey.gpg | 0 {dist => dist.linux}/share/cellframe-node.service | 0 {dist => dist.linux}/share/doc/changelog | 0 {dist => dist.linux}/share/logrotate/cellframe-node | 0 {dist => dist.linux}/share/profile.d/cellframe-node.sh | 0 6 files changed, 8 insertions(+), 2 deletions(-) rename {dist => dist.linux}/share/apt/demlabskey.gpg (100%) rename {dist => dist.linux}/share/cellframe-node.service (100%) rename {dist => dist.linux}/share/doc/changelog (100%) rename {dist => dist.linux}/share/logrotate/cellframe-node (100%) rename {dist => dist.linux}/share/profile.d/cellframe-node.sh (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8369c8f8..20a0d3193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,11 +38,11 @@ add_subdirectory(cellframe-sdk) if(UNIX) - if(LINUX) - message("[*] Linux package setup") SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}") SET(DESTDIR "/opt/${PROJECT_NAME}") + if(LINUX) + message("[*] Linux package setup") SET( CPACK_GENERATOR "DEB") @@ -175,6 +175,12 @@ if(NOT ANDROID) endif() INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") +if(LINUX) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.linux/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") +elseif(BSD) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") +endif() + INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) if(UNIX AND NOT ANDROID) diff --git a/dist/share/apt/demlabskey.gpg b/dist.linux/share/apt/demlabskey.gpg similarity index 100% rename from dist/share/apt/demlabskey.gpg rename to dist.linux/share/apt/demlabskey.gpg diff --git a/dist/share/cellframe-node.service b/dist.linux/share/cellframe-node.service similarity index 100% rename from dist/share/cellframe-node.service rename to dist.linux/share/cellframe-node.service diff --git a/dist/share/doc/changelog b/dist.linux/share/doc/changelog similarity index 100% rename from dist/share/doc/changelog rename to dist.linux/share/doc/changelog diff --git a/dist/share/logrotate/cellframe-node b/dist.linux/share/logrotate/cellframe-node similarity index 100% rename from dist/share/logrotate/cellframe-node rename to dist.linux/share/logrotate/cellframe-node diff --git a/dist/share/profile.d/cellframe-node.sh b/dist.linux/share/profile.d/cellframe-node.sh similarity index 100% rename from dist/share/profile.d/cellframe-node.sh rename to dist.linux/share/profile.d/cellframe-node.sh -- GitLab