diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f22f8b4a22..7153b6340e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -567,13 +567,6 @@ Try to link with static libraries, as much as possible, \ to make blender more portable across distributions" OFF ) - if(WITH_STATIC_LIBS) - option(WITH_BOOST_ICU "\ -Boost uses ICU library (required for linking with static Boost built with libicu)." - OFF - ) - mark_as_advanced(WITH_BOOST_ICU) - endif() endif() # Misc @@ -1513,16 +1506,6 @@ endif() # ----------------------------------------------------------------------------- # Common Checks for Compatible Options -if(WITH_INTERNATIONAL) - if(NOT WITH_BOOST) - message( - FATAL_ERROR - "Internationalization requires WITH_BOOST, the library may not have been found. " - "Configure BOOST or disable WITH_INTERNATIONAL" - ) - endif() -endif() - # Enable SIMD support if detected by `test_sse_support()` or `test_neon_support()`. # if(WITH_CPU_SIMD) @@ -1627,19 +1610,9 @@ if(WITH_OPENVDB) ${OPENEXR_INCLUDE_DIRS} ) - list(APPEND OPENVDB_LIBRARIES ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES}) - if(WITH_OPENVDB_BLOSC) list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB_BLOSC) - # Even when `WITH_OPENVDB_BLOSC` is set, `FindBlosc.cmake` isn't running. - # As this might be used at some point, check the libraries are defined. - if(DEFINED BLOSC_LIBRARIES) - list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES}) - endif() - list(APPEND OPENVDB_LIBRARIES ${ZLIB_LIBRARIES}) endif() - - list(APPEND OPENVDB_LIBRARIES ${BOOST_LIBRARIES} ${TBB_LIBRARIES}) endif() # ----------------------------------------------------------------------------- diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 7d6f0cdde7d..c83f6370174 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -262,11 +262,9 @@ if(WITH_BOOST) set(Boost_NO_WARN_NEW_VERSIONS ON) find_package(Boost COMPONENTS ${_boost_FIND_COMPONENTS}) - # Boost Python is separate to avoid linking Python into tests that don't need it. - set(BOOST_LIBRARIES ${Boost_LIBRARIES}) + # Boost Python is the only library Blender directly depends on, though USD headers. if(WITH_USD AND USD_PYTHON_SUPPORT) set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY}) - list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES}) endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_DEFINITIONS) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 66dee945388..8112ce0e4c8 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -475,7 +475,6 @@ if(WITH_BOOST) if(WITH_USD AND USD_PYTHON_SUPPORT) list(APPEND __boost_packages python${PYTHON_VERSION_NO_DOTS}) endif() - list(APPEND __boost_packages system) set(Boost_NO_WARN_NEW_VERSIONS ON) find_package(Boost 1.48 COMPONENTS ${__boost_packages}) if(NOT Boost_FOUND) @@ -486,27 +485,17 @@ if(WITH_BOOST) find_package(Boost 1.48 COMPONENTS ${__boost_packages}) endif() unset(__boost_packages) - if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) - find_package(IcuLinux) - endif() mark_as_advanced(Boost_DIR) # why doesn't boost do this? mark_as_advanced(Boost_INCLUDE_DIR) # why doesn't boost do this? endif() - # Boost Python is separate to avoid linking Python into tests that don't need it. - set(BOOST_LIBRARIES ${Boost_LIBRARIES}) + # Boost Python is the only library Blender directly depends on, though USD headers. if(WITH_USD AND USD_PYTHON_SUPPORT) set(BOOST_PYTHON_LIBRARIES ${Boost_PYTHON${PYTHON_VERSION_NO_DOTS}_LIBRARY}) - list(REMOVE_ITEM BOOST_LIBRARIES ${BOOST_PYTHON_LIBRARIES}) endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS}) set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") - - if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) - find_package(IcuLinux) - list(APPEND BOOST_LIBRARIES ${ICU_LIBRARIES}) - endif() endif() add_bundled_libraries(boost/lib) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 1f1d8c926a5..a06766b4af2 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -696,8 +696,8 @@ if(WITH_BOOST) set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}") set(BOOST_PREFIX "lib") endif() - set(BOOST_LIBRARIES) if(EXISTS ${BOOST_34_TRIGGER_FILE}) + # Boost Python is the only library Blender directly depends on, though USD headers. if(WITH_USD) set(BOOST_PYTHON_LIBRARIES debug ${BOOST_LIBPATH}/${BOOST_PREFIX}boost_python${_PYTHON_VERSION_NO_DOTS}-${BOOST_DEBUG_POSTFIX}.lib @@ -707,7 +707,6 @@ if(WITH_BOOST) endif() else() # we found boost using find_package set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) - set(BOOST_LIBRARIES ${Boost_LIBRARIES}) set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS}) endif() diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index 1bb7283c723..348ae3b3709 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -146,7 +146,6 @@ macro(cycles_external_libraries_append libraries) ${OPENEXR_LIBRARIES} ${OPENEXR_LIBRARIES} # For circular dependencies between libs. ${PUGIXML_LIBRARIES} - ${BOOST_LIBRARIES} ${PYTHON_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 10d2cefe800..d3eada1ddc1 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -48,15 +48,6 @@ if(WITH_OPENCOLORIO) ${OPENCOLORIO_LIBRARIES} ) - if(WIN32) - list(APPEND INC_SYS - ${BOOST_INCLUDE_DIR} - ) - list(APPEND LIB - ${BOOST_LIBRARIES} - ) - endif() - set(GLSL_SRC gpu_shader_display_transform_vert.glsl gpu_shader_display_transform_frag.glsl diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt index 0bfe03278a1..441cfd8bd5d 100644 --- a/source/blender/io/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -15,12 +15,6 @@ set(INC_SYS ${OPENEXR_INCLUDE_DIRS} ) -if(WITH_BOOST) - list(APPEND INC_SYS - ${BOOST_INCLUDE_DIR} - ) -endif() - set(SRC intern/abc_axis_conversion.cc intern/abc_customdata.cc @@ -95,12 +89,6 @@ set(LIB PRIVATE bf::windowmanager ) -if(WITH_BOOST) - list(APPEND LIB - ${BOOST_LIBRARIES} - ) -endif() - blender_add_lib(bf_io_alembic "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") if(WITH_GTESTS) diff --git a/source/blender/io/grease_pencil/CMakeLists.txt b/source/blender/io/grease_pencil/CMakeLists.txt index 0d2be5e38bb..67fdc38e343 100644 --- a/source/blender/io/grease_pencil/CMakeLists.txt +++ b/source/blender/io/grease_pencil/CMakeLists.txt @@ -72,10 +72,4 @@ if(WITH_HARU) add_definitions(-DWITH_HARU) endif() -if(WITH_BOOST) - list(APPEND LIB - ${BOOST_LIBRARIES} - ) -endif() - blender_add_lib(bf_io_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index cc1a1e4052e..abd02523c34 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -206,7 +206,6 @@ set(LIB ) list(APPEND LIB - ${BOOST_LIBRARIES} ${BOOST_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${USD_LIBRARIES} diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt index d1c4ccc85eb..955661ee0e0 100644 --- a/source/blender/render/hydra/CMakeLists.txt +++ b/source/blender/render/hydra/CMakeLists.txt @@ -67,7 +67,6 @@ set(INC_SYS set(LIB ${Epoxy_LIBRARIES} ${PYTHON_LIBRARIES} - ${BOOST_LIBRARIES} ${USD_LIBRARIES} ${TBB_LIBRARIES} PRIVATE bf::blenkernel