From 504c7c8c78a8fe1cca0f9ccdbef084900e1be13f Mon Sep 17 00:00:00 2001 From: Jean Luca Bez Date: Sat, 10 Jul 2021 00:07:55 -0700 Subject: [PATCH] Fix typo in CMake for forwarding mode and AGIOS --- src/client/CMakeLists.txt | 2 +- src/daemon/CMakeLists.txt | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 7527ffc17..66a5f6f7b 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -129,7 +129,7 @@ if (GKFS_ENABLE_FORWARDING) target_compile_definitions(gkfwd_daemon PUBLIC GKFS_ENABLE_FORWARDING - DGKFS_ENABLE_AGIOS + GKFS_ENABLE_AGIOS ) else () target_compile_definitions(gkfwd_daemon diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 608cff7b8..a62c8fa4c 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -95,23 +95,31 @@ install(TARGETS gkfs_daemon ) ################### Forwarding daemon ################### if (GKFS_ENABLE_FORWARDING) - set(FWD_DAEMON_SRC - ${DAEMON_SRC} - scheduler/agios.cpp - ) - set(FWD_DAEMON_HEADERS - ${DAEMON_HEADERS} - ../../include/daemon/scheduler/agios.hpp - ) - add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS}) - if (GKFS_ENABLE_AGIOS) + set(FWD_DAEMON_SRC + ${DAEMON_SRC} + scheduler/agios.cpp + ) + set(FWD_DAEMON_HEADERS + ${DAEMON_HEADERS} + ../../include/daemon/scheduler/agios.hpp + ) + add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS}) + target_compile_definitions(gkfwd_daemon PUBLIC GKFS_ENABLE_FORWARDING - DGKFS_ENABLE_AGIOS + GKFS_ENABLE_AGIOS ) else () + set(FWD_DAEMON_SRC + ${DAEMON_SRC} + ) + set(FWD_DAEMON_HEADERS + ${DAEMON_HEADERS} + ) + add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS}) + target_compile_definitions(gkfwd_daemon PUBLIC GKFS_ENABLE_FORWARDING -- GitLab