From 47f5ae5f1240a733b9b23d282a6e5fc9a447c094 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 22 Aug 2025 13:01:05 +0100 Subject: [PATCH] fix: Fix package issues (#2469) --- CMakeLists.txt | 7 +------ cmake/install/install.cmake | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 485c3982..16d6e63a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(integration_tests "Build integration tests" FALSE) option(benchmark "Build benchmarks" FALSE) option(docs "Generate doxygen docs" FALSE) option(coverage "Build test coverage report" FALSE) -option(packaging "Create distribution packages" FALSE) +option(package "Create distribution packages" FALSE) option(lint "Run clang-tidy checks during compilation" FALSE) option(static "Statically linked Clio" FALSE) option(snapshot "Build snapshot tool" FALSE) @@ -40,11 +40,6 @@ if (verbose) set(CMAKE_VERBOSE_MAKEFILE TRUE) endif () -if (packaging) - add_definitions(-DPKG=1) - target_compile_definitions(clio_options INTERFACE PKG=1) -endif () - # Clio tweaks and checks include(CheckCompiler) include(Settings) diff --git a/cmake/install/install.cmake b/cmake/install/install.cmake index a640447f..21f1da1e 100644 --- a/cmake/install/install.cmake +++ b/cmake/install/install.cmake @@ -5,7 +5,7 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") include(GNUInstallDirs) -install(TARGETS clio_server DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(TARGETS clio_server DESTINATION "${CMAKE_INSTALL_BINDIR}") file(READ docs/examples/config/example-config.json config) string(REGEX REPLACE "./clio_log" "/var/log/clio/" config "${config}")