Commit fc8d4029 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch '149-replace-boost-program_options-with-cli11' into 'master' 

Resolve "Replace boost::program_options with CLI11"

Closes #149

See merge request !90
parents 3e886a85 3e514b95

CMake/FindBoost_preprocessor.cmake

0 → 100644
+40 −0
Original line number Diff line number Diff line 
################################################################################

# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain            #

# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany          #

#                                                                              #

# This software was partially supported by the                                 #

# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #

#                                                                              #

# This software was partially supported by the                                 #

# ADA-FS project under the SPPEXA project funded by the DFG.                   #

#                                                                              #

# This file is part of GekkoFS.                                                #

#                                                                              #

# GekkoFS is free software: you can redistribute it and/or modify              #

# it under the terms of the GNU General Public License as published by         #

# the Free Software Foundation, either version 3 of the License, or            #

# (at your option) any later version.                                          #

#                                                                              #

# GekkoFS is distributed in the hope that it will be useful,                   #

# but WITHOUT ANY WARRANTY; without even the implied warranty of               #

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #

# GNU General Public License for more details.                                 #

#                                                                              #

# You should have received a copy of the GNU General Public License            #

# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #

#                                                                              #

# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



find_path(BOOST_PREPROCESSOR_INCLUDE_DIR

    NAMES boost/preprocessor.hpp

)



set(BOOST_PREPROCESSOR_INCLUDE_DIRS ${BOOST_PREPROCESSOR_INCLUDE_DIR})



include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Boost_preprocessor DEFAULT_MSG BOOST_PREPROCESSOR_INCLUDE_DIRS)



mark_as_advanced(

    BOOST_PREPROCESSOR_INCLUDE_DIR

)
 
 No newline at end of file

CMakeLists.txt

+8 −5
Original line number Diff line number Diff line
@@ -128,11 +128,6 @@ find_package(Abt REQUIRED) 
find_package(Margo REQUIRED)

find_package(Syscall_intercept REQUIRED)



# boost dependencies

find_package(Boost 1.53 REQUIRED

    COMPONENTS

    program_options

    )



find_package(Threads REQUIRED)
@@ -223,6 +218,12 @@ set_target_properties(spdlog 
    PROPERTIES

    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/external"

    )

add_library(CLI11 INTERFACE)

# we cannot use target_include_directories with CMake < 3.11

set_target_properties(CLI11

    PROPERTIES

    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/external"

    )



add_subdirectory(external/fmt)

set_property(TARGET fmt PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -260,6 +261,8 @@ include(CMakeDependentOption) 
cmake_dependent_option(GKFS_INSTALL_TESTS "Install GekkoFS self tests" OFF "GKFS_BUILD_TESTS" OFF)



if (GKFS_BUILD_TESTS)

    # Boost preprocessor header-only is supplied by the Mercury installation

    find_package(Boost_preprocessor REQUIRED)

    # check symbols exists doesn't work for statx. This is a workaround

    check_cxx_source_compiles("

        #include <fcntl.h>

external/CLI11/CLI11.hpp

0 → 100644
+9066 −0

File added.

Preview size limit exceeded, changes collapsed.

src/client/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ set(PRELOAD_LINK_LIBRARIES 
    mercury

    hermes

    fmt::fmt

    Boost::boost

    Threads::Threads

    Date::TZ

    )

src/daemon/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ set(DAEMON_LINK_LIBRARIES 
    log_util

    env_util

    spdlog

    CLI11

    fmt::fmt

    path_util

    # margo libs
@@ -72,8 +73,6 @@ set(DAEMON_LINK_LIBRARIES 
    mercury

    ${MARGO_LIBRARIES}

    # others

    Boost::boost

    Boost::program_options

    Threads::Threads

    )

set(DAEMON_INCLUDE_DIRS