lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-30 07:23:07 +03:00
Code Activity

Minor tweaks to boost library detection

Browse Source 
- Change default WITH_BOOST path to reside inside source tree
  to avoid permission problems or accidentally overwriting
  directories outside source tree.
- If system Boost installation is not found, optionally use
  header only unit test framework from location specified by
  WITH_BOOST.
- Fix extra-semi warning in provider_options.hpp.
This commit is contained in:
Teemu Ollakka
2022-09-19 12:35:03 +03:00
parent 453b81c6a7
commit 6caf006214
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
CMakeLists.txt
View File

@ -125,14 +125,14 @@ if (WSREP_LIB_WITH_UNIT_TESTS)
check_include_file_cxx(${json_HEADER} system_json_FOUND)
if (NOT system_json_FOUND)
if (NOT WITH_BOOST)
set(WITH_BOOST "${CMAKE_SOURCE_DIR}/../boost")
set(WITH_BOOST "${CMAKE_SOURCE_DIR}/third_party/boost")
endif()
set(DOWNLOAD_BOOST ON)
include (cmake/boost.cmake)
set(MIN_BOOST_VERSION "${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}")
message(STATUS "Boost includes: ${BOOST_INCLUDE_DIR}, ver: ${MIN_BOOST_VERSION}")
find_package(Boost ${MIN_BOOST_VERSION} REQUIRED
COMPONENTS json headers
COMPONENTS json headers unit_test_framework
PATHS ${WITH_BOOST}/lib/cmake
NO_DEFAULT_PATH
)
@ -149,10 +149,29 @@ if (WSREP_LIB_WITH_UNIT_TESTS)
include_directories(SYSTEM ${ADDITIONAL_CXX_INCLUDES})
endif()
endif()
else()
find_package(Boost ${MIN_BOOST_VERSION}
COMPONENTS unit_test_framework
)
if (NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
# Check if we have header implementation available from
# extracted source tarball.
if (NOT WITH_BOOST)
message(FATAL_ERROR "System Boost not found, specify Boost installation with WITH_BOOST=<install_dir>")
endif()
CHECK_CXX_SOURCE_COMPILES(
"
#define BOOST_TEST_ALTERNATIVE_INIT_API
#include <boost/test/included/unit_test.hpp>
bool init_unit_test() { return true; }
"
FOUND_BOOST_TEST_INCLUDED_UNIT_TEST_HPP)
if (NOT FOUND_BOOST_TEST_INCLUDED_UNIT_TEST_HPP)
message(FATAL_ERROR "Boost unit test header not found")
endif()
endif()
endif()
find_package(Boost ${MIN_BOOST_VERSION} REQUIRED
unit_test_framework
)
endif()
if (WSREP_LIB_WITH_DBSIM)

2
cmake/boost.cmake
View File

@ -48,7 +48,7 @@ FUNCTION(GET_FILE_SIZE FILE_NAME OUTPUT_SIZE)
ENDFUNCTION()
SET(BOOST_MAJOR "1")
SET(BOOST_MINOR "76")
SET(BOOST_MINOR "77")
SET(BOOST_PATCH "0")
SET(BOOST_PACKAGE_NAME "boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}")
SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")

2
include/wsrep/provider_options.hpp
View File

@ -57,7 +57,7 @@ namespace wsrep
class option_value
{
public:
virtual ~option_value(){};
virtual ~option_value(){}
virtual const char* as_string() const = 0;
virtual const void* get_ptr() const = 0;
};