Skip to content

Link against zstd, which current ProteoWizard needs #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
percolator wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Link against zstd, which current ProteoWizard needs #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions admin/builders/install_proteowizard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ for component in system thread chrono regex filesystem iostreams program_options
ln -s -f $(ls ../lib/libboost_${component}-*.a | head -n1) ../lib/libboost_${component}.a
done

# zstd needs the same treatment. Current ProteoWizard compresses binary data
# with it, so libpwiz_data_msdata_core references ZSTD_compress and friends,
# while bjam names its output libzstd-gcc11-mt-s.a and -lzstd finds nothing.
if ls ../lib/libzstd-*.a > /dev/null 2>&1; then
ln -s -f $(ls ../lib/libzstd-*.a | head -n1) ../lib/libzstd.a
fi

# copy the boost::asio and boost::unordered library, which are not included by the ProteoWizard boost tar but are needed for maracluster
cd ${tools_dir}
wget --no-verbose --no-check-certificate https://sourceforge.net/projects/asio/files/asio/1.18.2%20%28Stable%29/boost_asio_1_18_2.tar.gz/download -O boost_asio.tar.gz
Expand Down
14 changes: 14 additions & 0 deletions cmake/FindProteoWizard.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@ _pwiz_find_library(PWIZ_UTILITY_MINIXML_LIBRARY pwiz_utility_minimxml)
_pwiz_find_library(PWIZ_DATA_MSDATA_VERSION_LIBRARY pwiz_data_msdata_version)
_pwiz_find_library(PWIZ_SHA1_LIBRARY SHA1)

# Current ProteoWizard compresses binary data with zstd, so
# pwiz_data_msdata_core references ZSTD_compress, ZSTD_getErrorCode and
# friends; without the library the link fails with undefined references.
# Releases older than that do not build it at all, so it is optional, and it
# is appended after the libraries that need it, which is what a single-pass
# linker requires.
find_library(ZSTD_LIBRARY NAMES zstd)
mark_as_advanced(ZSTD_LIBRARY)
if(ZSTD_LIBRARY)
list(APPEND PWIZ_LIBRARIES ${ZSTD_LIBRARY})
else()
message(STATUS "zstd library not found; assuming a ProteoWizard that does not use it")
endif()

#/home/matthew/build-32bit/tools/proteowizard/lib/baf2sql_c.dll
#/home/matthew/build-32bit/tools/proteowizard/lib/cdt.dll
#/home/matthew/build-32bit/tools/proteowizard/lib/MassLynxRaw.dll
Expand Down
Loading