Verified Commit 960f0596 authored by Marc Vef's avatar Marc Vef Committed by Alberto Miranda
Browse files

Review: Minor fixes and adding GKFS_ENABLE_UNUSED_FUNCTIONS option

parent c212e376

CMake/gkfs-options.cmake

+8 −0
Original line number Diff line number Diff line
@@ -212,6 +212,14 @@ gkfs_define_option( 
  FEATURE_NAME "DOCS"

)



# build tests

gkfs_define_option(

    GKFS_ENABLE_UNUSED_FUNCTIONS

    HELP_TEXT "Enable unused functions compilation"

    DEFAULT_VALUE OFF

)





# build tests

gkfs_define_option(

  GKFS_BUILD_TESTS

CMakeLists.txt

+5 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ if (NOT CMAKE_BUILD_TYPE) 
    set(CMAKE_BUILD_TYPE Release

        CACHE STRING "Choose the type of build: Debug Release Memcheck" FORCE)

ENDIF (NOT CMAKE_BUILD_TYPE)

message(STATUS "[gekkofs] Build type: ${CMAKE_BUILD_TYPE}")

message(STATUS "[${PROJECT_NAME}] 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")
@@ -99,7 +99,7 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) 
        endif ()

    endif ()

endif ()

message(STATUS "[gekkofs] Project version: ${PROJECT_VERSION}")

message(STATUS "[${PROJECT_NAME}] Project version: ${PROJECT_VERSION}")

set(GKFS_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})

set(GKFS_VERSION_MINOR ${PROJECT_VERSION_MINOR})

set(GKFS_VERSION_PATCH ${PROJECT_VERSION_PATCH})
@@ -184,6 +184,8 @@ if(GKFS_ENABLE_ROCKSDB) 
    message(STATUS "[${PROJECT_NAME}] Checking for RocksDB")

    add_compile_definitions(GKFS_ENABLE_ROCKSDB)

    find_package(RocksDB 6.26.1 REQUIRED)

    message(STATUS "[${PROJECT_NAME}] RocksDB version ${RocksDB_VERSION}")

    message(STATUS "[${PROJECT_NAME}] RocksDB location ${RocksDB_DIR}")

endif()



if(GKFS_ENABLE_PARALLAX)
@@ -197,7 +199,7 @@ if(GKFS_ENABLE_PARALLAX) 
    message(STATUS "[${PROJECT_NAME}] Checking for libaio")

    find_package(AIO REQUIRED)



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

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

    find_package(Parallax REQUIRED)

    target_link_libraries(Parallax::parallax INTERFACE yaml AIO::AIO)

endif()

src/client/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#

# IMPORTANT: since the targets differ basically in their compile definitions, we

# need to keep any source files affected by such definitions (e.g.

# GFS_ENABLE_FORWARDING) in their own specific targets. Otherwise, they will not

# GKFS_ENABLE_FORWARDING) in their own specific targets. Otherwise, they will not

# be build with the correct defines.

add_library(gkfs_intercept_common STATIC)

set_property(TARGET gkfs_intercept_common PROPERTY POSITION_INDEPENDENT_CODE ON)

src/daemon/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ add_subdirectory(backend) 
#

# IMPORTANT: since the targets differ basically in their compile definitions, we

# need to keep any source files affected by such definitions (e.g.

# GFS_ENABLE_FORWARDING) in their own specific targets. Otherwise, they will not

# GKFS_ENABLE_FORWARDING) in their own specific targets. Otherwise, they will not

# be build with the correct defines.

add_library(gkfs_daemon_common STATIC)