From a67979ec40f914a320e90c2569754f39bcbb1896 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 29 Oct 2023 20:05:38 -0500 Subject: [PATCH] cleanup build --- cmake/boost.cmake | 166 ++++++++++++++--------------- cmake/versions.cmake | 3 - include/drives/fuse/fuse_drive.hpp | 2 +- 3 files changed, 84 insertions(+), 87 deletions(-) diff --git a/cmake/boost.cmake b/cmake/boost.cmake index c7acfc51..36c839c0 100644 --- a/cmake/boost.cmake +++ b/cmake/boost.cmake @@ -2,91 +2,91 @@ set(BOOST_PROJECT_NAME boost_${BOOST_VERSION}) set(BOOST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${BOOST_PROJECT_NAME}) set(BOOST_ADDRESS_MODEL 64) -set(BOOST_DLL_ARCH x64) -set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_DL}.tar.gz) +set(BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_REVISION}) +set(BOOST_VERSION2 ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_REVISION}) -if (UNIX OR MINGW) - if (IS_CLANG_COMPILER) - set(BOOST_TOOLSET --with-toolset=clang) - else () - set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}") - endif() +set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION2}.tar.gz) - if (IS_ARM64) - set (BOOST_ARCH arm) - else() - set (BOOST_ARCH x86) - endif() - - set (BOOST_COMMON_ARGS - ${BOOST_OPENSSL_DIR} - --prefix=${EXTERNAL_BUILD_ROOT} - address-model=${BOOST_ADDRESS_MODEL} - architecture=${BOOST_ARCH} - cxxflags=-std=c++${CMAKE_CXX_STANDARD} - cxxstd=${CMAKE_CXX_STANDARD} - define=BOOST_ASIO_HAS_STD_STRING_VIEW - define=BOOST_SYSTEM_NO_DEPRECATED - link=static - linkflags=-std=c++${CMAKE_CXX_STANDARD} - threading=multi - variant=${CMAKE_BUILD_TYPE_LOWER} - -sZLIB_BINARY=zlibstatic${DEBUG_EXTRA} - -sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib" - -sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include" - ) - - if (MINGW) - set(BOOST_COMMON_ARGS - ${BOOST_COMMON_ARGS} - --user-config=./user-config.jam - ) - set(BOOST_TARGET_OS target-os=windows) - endif() - - ExternalProject_Add(boost_project - DOWNLOAD_NO_PROGRESS 1 - URL ${BOOST_DOWNLOAD_URL} - PREFIX ${BOOST_BUILD_ROOT} - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND - cp -f ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/user-config.jam . && - ./bootstrap.sh - ${BOOST_TOOLSET} - ${BOOST_TARGET_OS} - --with-libraries=atomic,chrono,date_time,filesystem,random,regex,serialization,system,thread - BUILD_COMMAND - ./b2 - ${BOOST_COMMON_ARGS} - ${BOOST_TARGET_OS} - INSTALL_COMMAND - ./b2 - ${BOOST_COMMON_ARGS} - ${BOOST_TARGET_OS} - install - ) - - add_dependencies(boost_project openssl_project) - - set(BOOST_ROOT ${BOOST_BUILD_ROOT}/src/boost_project) - if (MINGW) - set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION}) - string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_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}") - endif() - - set(Boost_LIBRARIES - libboost_system${BOOST_LIB_EXTRA}.a - libboost_atomic${BOOST_LIB_EXTRA}.a - libboost_chrono${BOOST_LIB_EXTRA}.a - libboost_date_time${BOOST_LIB_EXTRA}.a - libboost_filesystem${BOOST_LIB_EXTRA}.a - libboost_random${BOOST_LIB_EXTRA}.a - libboost_regex${BOOST_LIB_EXTRA}.a - libboost_serialization${BOOST_LIB_EXTRA}.a - libboost_thread${BOOST_LIB_EXTRA}.a - ) +if (IS_CLANG_COMPILER) + set(BOOST_TOOLSET --with-toolset=clang) +else () + set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}") endif() +if (IS_ARM64) + set (BOOST_ARCH arm) +else() + set (BOOST_ARCH x86) +endif() + +set (BOOST_COMMON_ARGS + ${BOOST_OPENSSL_DIR} + --prefix=${EXTERNAL_BUILD_ROOT} + address-model=${BOOST_ADDRESS_MODEL} + architecture=${BOOST_ARCH} + cxxflags=-std=c++${CMAKE_CXX_STANDARD} + cxxstd=${CMAKE_CXX_STANDARD} + define=BOOST_ASIO_HAS_STD_STRING_VIEW + define=BOOST_SYSTEM_NO_DEPRECATED + link=static + linkflags=-std=c++${CMAKE_CXX_STANDARD} + threading=multi + variant=${CMAKE_BUILD_TYPE_LOWER} + -sZLIB_BINARY=zlibstatic${DEBUG_EXTRA} + -sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib" + -sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include" +) + +if (MINGW) + set(BOOST_COMMON_ARGS + ${BOOST_COMMON_ARGS} + --user-config=./user-config.jam + ) + set(BOOST_TARGET_OS target-os=windows) +endif() + +ExternalProject_Add(boost_project + DOWNLOAD_NO_PROGRESS 1 + URL ${BOOST_DOWNLOAD_URL} + PREFIX ${BOOST_BUILD_ROOT} + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND + cp -f ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/user-config.jam . && + ./bootstrap.sh + ${BOOST_TOOLSET} + ${BOOST_TARGET_OS} + --with-libraries=atomic,chrono,date_time,filesystem,random,regex,serialization,system,thread + BUILD_COMMAND + ./b2 + ${BOOST_COMMON_ARGS} + ${BOOST_TARGET_OS} + INSTALL_COMMAND + ./b2 + ${BOOST_COMMON_ARGS} + ${BOOST_TARGET_OS} + install +) + +add_dependencies(boost_project openssl_project) + +set(BOOST_ROOT ${BOOST_BUILD_ROOT}/src/boost_project) +if (MINGW) + set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION}) + string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_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}") +endif() + +set(Boost_LIBRARIES + libboost_system${BOOST_LIB_EXTRA}.a + libboost_atomic${BOOST_LIB_EXTRA}.a + libboost_chrono${BOOST_LIB_EXTRA}.a + libboost_date_time${BOOST_LIB_EXTRA}.a + libboost_filesystem${BOOST_LIB_EXTRA}.a + libboost_random${BOOST_LIB_EXTRA}.a + libboost_regex${BOOST_LIB_EXTRA}.a + libboost_serialization${BOOST_LIB_EXTRA}.a + libboost_thread${BOOST_LIB_EXTRA}.a +) + add_dependencies(boost_project zlib_project) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index fbd7ec24..0e8fd82b 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,9 +1,6 @@ set(BOOST_MAJOR_VERSION 1) set(BOOST_MINOR_VERSION 83) 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(GTEST_VERSION v1.14.0) set(LIBSODIUM_VERSION 1.0.19) diff --git a/include/drives/fuse/fuse_drive.hpp b/include/drives/fuse/fuse_drive.hpp index fd333499..5749a4f0 100644 --- a/include/drives/fuse/fuse_drive.hpp +++ b/include/drives/fuse/fuse_drive.hpp @@ -27,12 +27,12 @@ #include "file_manager/file_manager.hpp" namespace repertory { -class i_provider; class app_config; class console_consumer; class directory_cache; class eviction; class full_server; +class i_provider; class lock_data; class logging_consumer; namespace remote_fuse {