Skip to content

Commit

Permalink
remove mpack.variant, it is only used for C++11 and C++14, and macos …
Browse files Browse the repository at this point in the history
…from 2015. Not needed in DPP
  • Loading branch information
braindigitalis committed Sep 27, 2024
1 parent 0d6aff8 commit 7e1d377
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 2,854 deletions.
11 changes: 0 additions & 11 deletions mlspp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ message(STATUS "OpenSSL Libraries: ${OPENSSL_LIBRARIES}")
# Internal libraries
add_subdirectory(lib)

# Third-Party libraries in tree
add_subdirectory(third_party)


###
### Library Config
###
Expand All @@ -105,13 +101,6 @@ target_include_directories(${LIB_NAME}
### Exports
###
set(CMAKE_EXPORT_PACKAGE_REGISTRY ON)
export(
EXPORT
mlspp-targets
NAMESPACE
${MLS_EXPORT_NAMESPACE}::
FILE
${MLS_EXPORT_NAMESPACE}Targets.cmake)
export(PACKAGE ${MLS_EXPORT_NAMESPACE})

configure_package_config_file(cmake/config.cmake.in
Expand Down
7 changes: 0 additions & 7 deletions mlspp/lib/bytes/include/tls/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@

namespace mlspp::tls {

// To balance backward-compatibility with macOS 10.11 with forward-compatibility
// with future versions of C++, we use `mpark::variant` or `std::variant` as
// needed, using `var::variant` to refer to whichever one is in use.
#ifdef VARIANT_COMPAT
namespace var = mpark;
#else
namespace var = std;
#endif // VARIANT_COMPAT

// In a similar vein, we provide our own safe accessors for std::optional, since
// std::optional::value() is not available on macOS 10.11.
Expand Down
2 changes: 0 additions & 2 deletions mlspp/lib/tls_syntax/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/inc
file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")

add_library(${CURRENT_LIB_NAME} STATIC ${LIB_HEADERS} ${LIB_SOURCES})
add_dependencies(${CURRENT_LIB_NAME} third_party)
target_link_libraries(${CURRENT_LIB_NAME} PUBLIC third_party)
target_include_directories(${CURRENT_LIB_NAME}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down
7 changes: 0 additions & 7 deletions mlspp/lib/tls_syntax/include/tls/compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@

namespace mlspp::tls {

// To balance backward-compatibility with macOS 10.11 with forward-compatibility
// with future versions of C++, we use `mpark::variant` or `std::variant` as
// needed, using `var::variant` to refer to whichever one is in use.
#ifdef VARIANT_COMPAT
namespace var = mpark;
#else
namespace var = std;
#endif // VARIANT_COMPAT

// In a similar vein, we provide our own safe accessors for std::optional, since
// std::optional::value() is not available on macOS 10.11.
Expand Down
14 changes: 0 additions & 14 deletions mlspp/third_party/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 7e1d377

Please sign in to comment.