Fix CMake for forwarding mode and AGIOS

Jean Bezrequested to merge
fix into master

Fix typo in CMake for AGIOS scheduling library and and issue where it forced us to have AGIOS installed even if we did not want to use it with the forwarding mode.

Merge request reports

src/client/CMakeLists.txt

+1 −1
Changes for src/client/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

src/daemon/CMakeLists.txt

+10 −2
Changes for src/daemon/CMakeLists.txt: 10 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ install(TARGETS gkfs_daemon 
    )

################### Forwarding daemon ###################

if (GKFS_ENABLE_FORWARDING)

    if (GKFS_ENABLE_AGIOS)

        set(FWD_DAEMON_SRC

            ${DAEMON_SRC}

            scheduler/agios.cpp
@@ -105,13 +106,20 @@ if (GKFS_ENABLE_FORWARDING) 
            )

        add_executable(gkfwd_daemon ${FWD_DAEMON_SRC} ${FWD_DAEMON_HEADERS})



    if (GKFS_ENABLE_AGIOS)

        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