Verified Commit 40560569 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Better dependency inclusion in CMakeLists

parent 72ecd80f

CMakeLists.txt

+5 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}") 
# Compiler flags for various cmake build types

set(WARNINGS_FLAGS "-Wall -Wextra --pedantic -Wno-unused-parameter -Wno-missing-field-initializers")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_MEMCHECK "${WARNINGS_FLAGS} -g -O0 -fsanitize=address -fno-omit-frame-pointer")

set(CMAKE_CXX_FLAGS_MAINTAINER "${WARNINGS_FLAGS} -g -O0 -pg -no-pie")

set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O3")
@@ -175,19 +175,11 @@ set_target_properties(spdlog 
    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/external"

)



add_library(fmt INTERFACE)

# we cannot use target_include_directories with CMake < 3.11

set_target_properties(fmt

    PROPERTIES

    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/external/spdlog"

)

add_subdirectory(external/fmt)

set_property(TARGET fmt PROPERTY POSITION_INDEPENDENT_CODE ON)



add_library(hermes INTERFACE)

# we cannot use target_include_directories with CMake < 3.11

set_target_properties(hermes

    PROPERTIES

    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/external/hermes/include"

)

add_subdirectory(external/hermes)

target_compile_definitions(hermes INTERFACE)



set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")

include/client/logging.hpp

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <boost/optional.hpp>

#include <client/make_array.hpp>

#include <client/syscalls.hpp>

#include <fmt/fmt.h>

#include <fmt/ostr.h>

#include <fmt/format.h>

#include <fmt/ostream.h>

#include <date/tz.h>



#ifdef GKFS_DEBUG_BUILD

include/client/syscalls/args.hpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <unistd.h>



#include <type_traits>

#include <fmt/fmt.h>

#include <fmt/format.h>

#include <client/syscalls/detail/syscall_info.h>



namespace gkfs {

include/client/syscalls/rets.hpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef GKFS_SYSCALLS_RETS_HPP

#define GKFS_SYSCALLS_RETS_HPP



#include <fmt/fmt.h>

#include <fmt/format.h>

#include <type_traits>

#include <client/syscalls/detail/syscall_info.h>

src/client/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ target_link_libraries(gkfs_intercept 
    dl

    mercury

    hermes

    fmt

    fmt::fmt

    Boost::boost # needed for tokenizer header

    Threads::Threads

    Date::TZ