@@ -122,7 +122,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
122
122
include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR} /include/ )
123
123
include_directories (SYSTEM ${CMAKE_CURRENT_SOURCE_DIR} /third_party/sol2/include )
124
124
125
- set (BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework )
125
+ set (BOOST_COMPONENTS date_time iostreams program_options thread unit_test_framework )
126
126
127
127
configure_file (
128
128
${CMAKE_CURRENT_SOURCE_DIR} /include/util/version.hpp.in
@@ -348,8 +348,7 @@ if(ENABLE_CONAN)
348
348
GENERATORS cmake_find_package json # json generator generates a conanbuildinfo.json in the build folder so (non-CMake) projects can easily parse OSRM's dependencies
349
349
KEEP_RPATHS
350
350
NO_OUTPUT_DIRS
351
- OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
352
- boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
351
+ OPTIONS boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
353
352
BUILD missing
354
353
)
355
354
@@ -378,14 +377,10 @@ if(ENABLE_CONAN)
378
377
set (Boost_USE_STATIC_LIBS ON )
379
378
find_package (Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
380
379
set (Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS} " )
381
- set (Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS} " )
382
380
set (Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS} " )
383
- set (Boost_FILESYSTEM_LIBRARY "${Boost_filesystem_LIB_TARGETS} " )
384
381
set (Boost_IOSTREAMS_LIBRARY "${Boost_iostreams_LIB_TARGETS} " )
385
382
set (Boost_THREAD_LIBRARY "${Boost_thread_LIB_TARGETS} " )
386
- set (Boost_SYSTEM_LIBRARY "${Boost_system_LIB_TARGETS} " )
387
383
set (Boost_ZLIB_LIBRARY "${Boost_zlib_LIB_TARGETS} " )
388
- set (Boost_REGEX_LIBRARY "${Boost_regex_LIB_TARGETS} " )
389
384
set (Boost_UNIT_TEST_FRAMEWORK_LIBRARY "${Boost_unit_test_framework_LIB_TARGETS} " )
390
385
391
386
@@ -458,7 +453,6 @@ add_dependency_includes(${ZLIB_INCLUDE_DIRS})
458
453
459
454
add_dependency_defines (-DBOOST_SPIRIT_USE_PHOENIX_V3 )
460
455
add_dependency_defines (-DBOOST_RESULT_OF_USE_DECLTYPE )
461
- add_dependency_defines (-DBOOST_FILESYSTEM_NO_DEPRECATED )
462
456
463
457
# Workaround for https://github.com/boostorg/phoenix/issues/111
464
458
add_dependency_defines (-DBOOST_PHOENIX_STL_TUPLE_H_ )
@@ -468,11 +462,8 @@ include_directories(SYSTEM ${DEPENDENCIES_INCLUDE_DIRS})
468
462
469
463
set (BOOST_BASE_LIBRARIES
470
464
${Boost_DATE_TIME_LIBRARY}
471
- ${Boost_CHRONO_LIBRARY}
472
- ${Boost_FILESYSTEM_LIBRARY}
473
465
${Boost_IOSTREAMS_LIBRARY}
474
- ${Boost_THREAD_LIBRARY}
475
- ${Boost_SYSTEM_LIBRARY} )
466
+ ${Boost_THREAD_LIBRARY} )
476
467
477
468
set (BOOST_ENGINE_LIBRARIES
478
469
${Boost_ZLIB_LIBRARY}
@@ -491,7 +482,6 @@ endif()
491
482
492
483
set (EXTRACTOR_LIBRARIES
493
484
${BZIP2_LIBRARIES}
494
- ${Boost_REGEX_LIBRARY}
495
485
${BOOST_BASE_LIBRARIES}
496
486
${CMAKE_THREAD_LIBS_INIT}
497
487
${EXPAT_LIBRARIES}
0 commit comments