diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | indra/cmake/Boost.cmake | 33 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 16 | ||||
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 88 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 88 | 
5 files changed, 197 insertions, 32 deletions
| @@ -36,12 +36,10 @@ $ cd build-`uname -s|tr '[:upper:]' '[:lower:]'`-`uname -m`  ### macOS  ``` -$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost +universal boost181 +universal -no_static glm hunspell +universal freetype +universal minizip +universal pcre +universal uriparser +universal libvorbis +universal xxhashlib +$ sudo port install cmake pkgconfig freealut +universal apr-util +universal boost181 +universal glm hunspell +universal freetype +universal minizip +universal pcre +universal uriparser +universal libvorbis +universal xxhashlib  $ export LL_BUILD="-O3 -gdwarf-2 -stdlib=libc++ -mmacosx-version-min=11 -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -std=c++17 -fPIC -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG -DPIC -DLL_DARWIN=1"  $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=newview/Megapahit.app/Contents/Resources -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11 -DENABLE_SIGNING:BOOL=ON -DSIGNING_IDENTITY:STRING=- ../indra -$ sudo port deactivate boost  $ make -j`sysctl -n hw.ncpu` -$ sudo port activate boost  $ make install  $ open newview/Megapahit.app  ``` diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index f54eb3e3db..31bb4124c2 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -10,30 +10,22 @@ if( USE_CONAN )    return()  elseif( NOT USE_AUTOBUILD_3P )    if (DARWIN) +    set(sfx "-mt")      target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.81/include) -    target_link_libraries( ll::boost INTERFACE -      /opt/local/libexec/boost/1.81/lib/libboost_context-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_fiber-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_filesystem-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_program_options-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_regex-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_system-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_thread-mt.a -      /opt/local/libexec/boost/1.81/lib/libboost_url-mt.a -      ) +    target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.81/lib)    else (DARWIN)      find_package( Boost REQUIRED ) -    target_link_libraries( ll::boost INTERFACE -      boost_context -      boost_fiber -      boost_filesystem -      boost_program_options -      boost_regex -      boost_system -      boost_thread -      boost_url -      )    endif (DARWIN) +  target_link_libraries( ll::boost INTERFACE +    boost_context${sfx} +    boost_fiber${sfx} +    boost_filesystem${sfx} +    boost_program_options${sfx} +    boost_regex${sfx} +    boost_system${sfx} +    boost_thread${sfx} +    boost_url${sfx} +    )    target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )    return()  endif() @@ -61,7 +53,6 @@ elseif (LINUX)            boost_filesystem-mt${addrsfx}            boost_program_options-mt${addrsfx}            boost_regex-mt${addrsfx} -          boost_thread-mt${addrsfx}            boost_system-mt${addrsfx}            boost_thread-mt${addrsfx}            boost_url-mt${addrsfx}) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 03a5d165b3..b712b71e54 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -50,14 +50,14 @@ if( USESYSTEMLIBS )          TARGET collada14dom          CMAKE_FLAGS            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Libxml2_LIBRARY_DIRS} +          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS} +          "-DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS} -L${Minizip_LIBRARY_DIRS}exec/boost/1.81/lib"            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem-mt            -DBoost_SYSTEM_LIBRARY:STRING=boost_system-mt -          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}/libxml2 -          -DEXTRA_COMPILE_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS} -          -DBoost_CFLAGS:STRING=-I${Libpcrecpp_INCLUDE_DIRS} +          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS} +          -DBoost_CFLAGS:STRING=-I${Libpcrecpp_LIBRARY_DIRS}exec/boost/1.81/include            -DOPT_COLLADA14:BOOL=ON            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada            -DCOLLADA_DOM_SOVERSION:STRING=0 @@ -88,13 +88,13 @@ if( USESYSTEMLIBS )          TARGET collada14dom          CMAKE_FLAGS            -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Libxml2_LIBRARY_DIRS} +          -DCMAKE_CXX_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS} +          -DCMAKE_SHARED_LINKER_FLAGS:STRING=-L${Minizip_LIBRARY_DIRS}            -Dlibpcrecpp_LIBRARIES:STRING=pcrecpp            -DZLIB_LIBRARIES:STRING=${Libxml2_LIBRARIES}            -DBoost_FILESYSTEM_LIBRARY:STRING=boost_filesystem            -DBoost_SYSTEM_LIBRARY:STRING=boost_system -          -Dlibpcrecpp_CFLAGS_OTHERS:STRING=-I${Libxml2_INCLUDE_DIRS} -          -DEXTRA_COMPILE_FLAGS:STRING=-I${Minizip_INCLUDE_DIRS} +          -DEXTRA_COMPILE_FLAGS:STRING=-I${Libxml2_INCLUDE_DIRS}            -DBoost_CFLAGS:STRING=-I${Libpcrecpp_INCLUDE_DIRS}            -DOPT_COLLADA14:BOOL=ON            -DCOLLADA_DOM_INCLUDE_INSTALL_DIR:FILEPATH=${LIBS_PREBUILT_DIR}/include/collada @@ -121,7 +121,7 @@ if( USESYSTEMLIBS )            ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/include/modules          DESTINATION ${LIBS_PREBUILT_DIR}/include/collada          ) -      file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "0") +      file(WRITE ${PREBUILD_TRACKING_DIR}/colladadom_installed "${colladadom_installed}")      endif (${COLLADADOM_RESULT})    endif( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 )  else( USESYSTEMLIBS ) diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 069a0e50a6..9b62a02b5e 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -42,6 +42,51 @@ file(CREATE_LINK      SYMBOLIC      )  file(CREATE_LINK +    "../../../../Frameworks/libboost_atomic-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_atomic-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_context-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_context-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_fiber-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_fiber-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_filesystem-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_filesystem-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_program_options-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_program_options-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_regex-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_regex-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_system-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_system-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_thread-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_thread-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_url-mt.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_url-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK      "../../../../Frameworks/libexpat.1.dylib"      "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libexpat.1.dylib"      SYMBOLIC @@ -67,6 +112,21 @@ file(CREATE_LINK      SYMBOLIC      )  file(CREATE_LINK +    "../../../../Frameworks/libicudata.74.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libicui18n.74.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libicuuc.74.dylib" +    "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK      "../../../../Frameworks/Chromium Embedded Framework.framework"      "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework"      SYMBOLIC @@ -91,12 +151,33 @@ execute_process(      COMMAND lipo libaprutil-1.0.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libaprutil-1.0.dylib +    COMMAND lipo libboost_atomic-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_atomic-mt.dylib +    COMMAND lipo libboost_context-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_context-mt.dylib +    COMMAND lipo libboost_fiber-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_fiber-mt.dylib      COMMAND lipo libboost_filesystem-mt.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libboost_filesystem-mt.dylib +    COMMAND lipo libboost_program_options-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_program_options-mt.dylib +    COMMAND lipo libboost_regex-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_regex-mt.dylib      COMMAND lipo libboost_system-mt.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libboost_system-mt.dylib +    COMMAND lipo libboost_thread-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_thread-mt.dylib +    COMMAND lipo libboost_url-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_url-mt.dylib      COMMAND lipo libbrotlicommon.1.1.0.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libbrotlicommon.1.1.0.dylib @@ -200,8 +281,15 @@ execute_process(          Frameworks/libalut.0.dylib          Frameworks/libapr-1.0.dylib          Frameworks/libaprutil-1.0.dylib +        Frameworks/libboost_atomic-mt.dylib +        Frameworks/libboost_context-mt.dylib +        Frameworks/libboost_fiber-mt.dylib          Frameworks/libboost_filesystem-mt.dylib +        Frameworks/libboost_program_options-mt.dylib +        Frameworks/libboost_regex-mt.dylib          Frameworks/libboost_system-mt.dylib +        Frameworks/libboost_thread-mt.dylib +        Frameworks/libboost_url-mt.dylib          Frameworks/libbrotlicommon.1.1.0.dylib          Frameworks/libbrotlidec.1.1.0.dylib          Frameworks/libbz2.1.0.8.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 50c381540c..ae104f9a31 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -42,6 +42,51 @@ file(CREATE_LINK      SYMBOLIC      )  file(CREATE_LINK +    "../../../../Frameworks/libboost_atomic-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_atomic-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_context-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_context-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_fiber-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_fiber-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_filesystem-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_filesystem-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_program_options-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_program_options-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_regex-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_regex-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_system-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_system-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_thread-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_thread-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libboost_url-mt.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libboost_url-mt.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK      "../../../../Frameworks/libexpat.1.dylib"      "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libexpat.1.dylib"      SYMBOLIC @@ -67,6 +112,21 @@ file(CREATE_LINK      SYMBOLIC      )  file(CREATE_LINK +    "../../../../Frameworks/libicudata.74.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicudata.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libicui18n.74.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicui18n.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK +    "../../../../Frameworks/libicuuc.74.dylib" +    "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libicuuc.74.dylib" +    SYMBOLIC +    ) +file(CREATE_LINK      "../../../../Frameworks/Chromium Embedded Framework.framework"      "${CMAKE_CACHEFILE_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/Bundle/${CPACK_BUNDLE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}/${CPACK_BUNDLE_NAME}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework"      SYMBOLIC @@ -91,12 +151,33 @@ execute_process(      COMMAND lipo libaprutil-1.0.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libaprutil-1.0.dylib +    COMMAND lipo libboost_atomic-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_atomic-mt.dylib +    COMMAND lipo libboost_context-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_context-mt.dylib +    COMMAND lipo libboost_fiber-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_fiber-mt.dylib      COMMAND lipo libboost_filesystem-mt.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libboost_filesystem-mt.dylib +    COMMAND lipo libboost_program_options-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_program_options-mt.dylib +    COMMAND lipo libboost_regex-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_regex-mt.dylib      COMMAND lipo libboost_system-mt.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libboost_system-mt.dylib +    COMMAND lipo libboost_thread-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_thread-mt.dylib +    COMMAND lipo libboost_url-mt.dylib +        -thin ${CMAKE_OSX_ARCHITECTURES} +        -output libboost_url-mt.dylib      COMMAND lipo libbrotlicommon.1.1.0.dylib          -thin ${CMAKE_OSX_ARCHITECTURES}          -output libbrotlicommon.1.1.0.dylib @@ -200,8 +281,15 @@ execute_process(          Frameworks/libalut.0.dylib          Frameworks/libapr-1.0.dylib          Frameworks/libaprutil-1.0.dylib +        Frameworks/libboost_atomic-mt.dylib +        Frameworks/libboost_context-mt.dylib +        Frameworks/libboost_fiber-mt.dylib          Frameworks/libboost_filesystem-mt.dylib +        Frameworks/libboost_program_options-mt.dylib +        Frameworks/libboost_regex-mt.dylib          Frameworks/libboost_system-mt.dylib +        Frameworks/libboost_thread-mt.dylib +        Frameworks/libboost_url-mt.dylib          Frameworks/libbrotlicommon.1.1.0.dylib          Frameworks/libbrotlidec.1.1.0.dylib          Frameworks/libbz2.1.0.8.dylib | 
