BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

cleanup build
All checks were successful
BlockStorage/repertory_osx/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves 2023-10-29 20:05:38 -05:00
parent 54bfc11620
commit a67979ec40
3 changed files with 84 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cmake/boost.cmake
View File

@ -2,23 +2,24 @@ set(BOOST_PROJECT_NAME boost_${BOOST_VERSION})
set(BOOST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${BOOST_PROJECT_NAME}) set(BOOST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${BOOST_PROJECT_NAME})
set(BOOST_ADDRESS_MODEL 64) set(BOOST_ADDRESS_MODEL 64)
set(BOOST_DLL_ARCH x64) set(BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_REVISION})
set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_DL}.tar.gz) set(BOOST_VERSION2 ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_REVISION})
if (UNIX OR MINGW) set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION2}.tar.gz)
if (IS_CLANG_COMPILER)
if (IS_CLANG_COMPILER)
set(BOOST_TOOLSET --with-toolset=clang) set(BOOST_TOOLSET --with-toolset=clang)
else () else ()
set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}") set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}")
endif() endif()
if (IS_ARM64) if (IS_ARM64)
set (BOOST_ARCH arm) set (BOOST_ARCH arm)
else() else()
set (BOOST_ARCH x86) set (BOOST_ARCH x86)
endif() endif()
set (BOOST_COMMON_ARGS set (BOOST_COMMON_ARGS
${BOOST_OPENSSL_DIR} ${BOOST_OPENSSL_DIR}
--prefix=${EXTERNAL_BUILD_ROOT} --prefix=${EXTERNAL_BUILD_ROOT}
address-model=${BOOST_ADDRESS_MODEL} address-model=${BOOST_ADDRESS_MODEL}
@ -34,17 +35,17 @@ if (UNIX OR MINGW)
-sZLIB_BINARY=zlibstatic${DEBUG_EXTRA} -sZLIB_BINARY=zlibstatic${DEBUG_EXTRA}
-sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib" -sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib"
-sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include" -sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include"
) )
if (MINGW) if (MINGW)
set(BOOST_COMMON_ARGS set(BOOST_COMMON_ARGS
${BOOST_COMMON_ARGS} ${BOOST_COMMON_ARGS}
--user-config=./user-config.jam --user-config=./user-config.jam
) )
set(BOOST_TARGET_OS target-os=windows) set(BOOST_TARGET_OS target-os=windows)
endif() endif()
ExternalProject_Add(boost_project ExternalProject_Add(boost_project
DOWNLOAD_NO_PROGRESS 1 DOWNLOAD_NO_PROGRESS 1
URL ${BOOST_DOWNLOAD_URL} URL ${BOOST_DOWNLOAD_URL}
PREFIX ${BOOST_BUILD_ROOT} PREFIX ${BOOST_BUILD_ROOT}
@ -64,19 +65,19 @@ if (UNIX OR MINGW)
${BOOST_COMMON_ARGS} ${BOOST_COMMON_ARGS}
${BOOST_TARGET_OS} ${BOOST_TARGET_OS}
install install
) )
add_dependencies(boost_project openssl_project) add_dependencies(boost_project openssl_project)
set(BOOST_ROOT ${BOOST_BUILD_ROOT}/src/boost_project) set(BOOST_ROOT ${BOOST_BUILD_ROOT}/src/boost_project)
if (MINGW) if (MINGW)
set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION}) set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION})
string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION}) string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION})
list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION) list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION)
# set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}") # set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}")
endif() endif()
set(Boost_LIBRARIES set(Boost_LIBRARIES
libboost_system${BOOST_LIB_EXTRA}.a libboost_system${BOOST_LIB_EXTRA}.a
libboost_atomic${BOOST_LIB_EXTRA}.a libboost_atomic${BOOST_LIB_EXTRA}.a
libboost_chrono${BOOST_LIB_EXTRA}.a libboost_chrono${BOOST_LIB_EXTRA}.a
@ -86,7 +87,6 @@ if (UNIX OR MINGW)
libboost_regex${BOOST_LIB_EXTRA}.a libboost_regex${BOOST_LIB_EXTRA}.a
libboost_serialization${BOOST_LIB_EXTRA}.a libboost_serialization${BOOST_LIB_EXTRA}.a
libboost_thread${BOOST_LIB_EXTRA}.a libboost_thread${BOOST_LIB_EXTRA}.a
) )
endif()
add_dependencies(boost_project zlib_project) add_dependencies(boost_project zlib_project)

3
cmake/versions.cmake
View File

@ -1,9 +1,6 @@
set(BOOST_MAJOR_VERSION 1) set(BOOST_MAJOR_VERSION 1)
set(BOOST_MINOR_VERSION 83) set(BOOST_MINOR_VERSION 83)
set(BOOST_REVISION 0) set(BOOST_REVISION 0)
set(BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_REVISION})
set(BOOST_VERSION_DL ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_REVISION})
set(BOOST_VERSION_DLL ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
set(CURL_VERSION 8_4_0) set(CURL_VERSION 8_4_0)
set(GTEST_VERSION v1.14.0) set(GTEST_VERSION v1.14.0)
set(LIBSODIUM_VERSION 1.0.19) set(LIBSODIUM_VERSION 1.0.19)

2
include/drives/fuse/fuse_drive.hpp
View File

@ -27,12 +27,12 @@
#include "file_manager/file_manager.hpp" #include "file_manager/file_manager.hpp"
namespace repertory { namespace repertory {
class i_provider;
class app_config; class app_config;
class console_consumer; class console_consumer;
class directory_cache; class directory_cache;
class eviction; class eviction;
class full_server; class full_server;
class i_provider;
class lock_data; class lock_data;
class logging_consumer; class logging_consumer;
namespace remote_fuse { namespace remote_fuse {