Verified Commit b1adbd33 authored by Marc Vef's avatar Marc Vef
Browse files

CMake fixes: disable fmt install, set proper ZMQ dependency restrictions

parent fd4f8b03

CMake/gkfs-options.cmake

+1 −1
Original line number Original line Diff line number Diff line
@@ -370,6 +370,6 @@ gkfs_define_option( 
gkfs_define_option(

gkfs_define_option(

    GKFS_ENABLE_CLIENT_METRICS

    GKFS_ENABLE_CLIENT_METRICS

    HELP_TEXT "Enable client metrics via MSGPack"

    HELP_TEXT "Enable client metrics via MSGPack"

    DEFAULT_VALUE ON # TODO disable by default

    DEFAULT_VALUE OFF

    DESCRIPTION "If GKFS_ENABLE_CLIENT_METRICS is ON, use MSGPack to dump client read/write metrics"

    DESCRIPTION "If GKFS_ENABLE_CLIENT_METRICS is ON, use MSGPack to dump client read/write metrics"

)
 
)
 
 No newline at end of file

CMakeLists.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 3.13) 




project(

project(

    GekkoFS

    GekkoFS

    VERSION 0.9.2

    VERSION 0.9.3

    LANGUAGES ASM CXX C

    LANGUAGES ASM CXX C

)

)
@@ -170,7 +170,7 @@ endif() 
if (GKFS_ENABLE_CLIENT_METRICS)

if (GKFS_ENABLE_CLIENT_METRICS)

    ### zeromq: required for sending client metrics to FTIO

    ### zeromq: required for sending client metrics to FTIO

    message(STATUS "[${PROJECT_NAME}] Checking for cppzmq")

    message(STATUS "[${PROJECT_NAME}] Checking for cppzmq")

    find_package(cppzmq)

    find_package(cppzmq REQUIRED)

endif ()

endif ()





### Metadata backends

### Metadata backends
@@ -224,6 +224,7 @@ find_package(Filesystem REQUIRED) 
set(GKFS_DEPENDENCIES_PATH ${CMAKE_SOURCE_DIR}/external)

set(GKFS_DEPENDENCIES_PATH ${CMAKE_SOURCE_DIR}/external)





### {fmt}: required for sensible output formatting

### {fmt}: required for sensible output formatting

set(FMT_INSTALL OFF)

include_from_source(fmt

include_from_source(fmt

  MESSAGE "[${PROJECT_NAME}] Searching for {fmt}"

  MESSAGE "[${PROJECT_NAME}] Searching for {fmt}"

  SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/fmt

  SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/fmt