Skip to content

Commit 453bba4

Browse files
authored
Merge pull request #203 from tstenner/slimserialization
Replace Boost.Archive
2 parents c1d30d8 + 96b1cef commit 453bba4

File tree

1,123 files changed

+429
-249061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,123 files changed

+429
-249061
lines changed

CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ option(LSL_OPTIMIZATIONS "Enable some more compiler optimizations" ON)
2525
option(LSL_UNITTESTS "Build LSL library unit tests" OFF)
2626
option(LSL_BUNDLED_BOOST "Use the bundled Boost by default" ON)
2727
option(LSL_BUNDLED_PUGIXML "Use the bundled pugixml by default" ON)
28-
option(LSL_SLIMARCHIVE "Use experimental but smaller serialization code" OFF)
2928
option(LSL_TOOLS "Build some experimental tools for in-depth tests" OFF)
3029

31-
mark_as_advanced(LSL_SLIMARCHIVE LSL_FORCE_FANCY_LIBNAME)
30+
mark_as_advanced(LSL_FORCE_FANCY_LIBNAME)
3231

3332
set(LSL_WINVER "0x0601" CACHE STRING
3433
"Windows version (_WIN32_WINNT) to target (defaults to 0x0601 for Windows 7)")
@@ -182,13 +181,6 @@ else()
182181
target_link_libraries(lslboost INTERFACE Boost::boost Boost::disable_autolinking)
183182
endif()
184183

185-
if(LSL_SLIMARCHIVE OR NOT LSL_BUNDLED_BOOST)
186-
message(STATUS "Using shim instead of full Boost.Archive")
187-
target_compile_definitions(lslboost INTERFACE SLIMARCHIVE)
188-
elseif(LSL_BUNDLED_BOOST)
189-
# compile Boost.Serialization objects as part of lslobj
190-
target_sources(lslobj PRIVATE lslboost/serialization_objects.cpp)
191-
endif()
192184
target_compile_definitions(lslboost INTERFACE BOOST_ALL_NO_LIB)
193185

194186
# target configuration for the internal lslobj target

lslboost/boost/archive/archive_exception.hpp

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)