Skip to content

Commit

Permalink
Merge pull request #259 from tcezard/dynamic_boost
Browse files Browse the repository at this point in the history
EVA-3674 - Use dynamic libraries from boost in OSX
  • Loading branch information
tcezard authored Oct 1, 2024
2 parents 6fbcde8 + 2f88982 commit 1edca3e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ jobs:
- name: Compile and test
run: |
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} ..
export LIBRARY_PATH=${LIBRARY_PATH}:/opt/homebrew/opt/icu4c/lib:/opt/homebrew/lib
make -j2
cd .. && ./build/bin/test_validation_suite
- name: Rename release files
Expand Down
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if (LINUX)
elseif (OSX)
# Mac build not fully static. include system libraries to be dynamic
set (CMAKE_EXE_LINKER_FLAGS)
set (Boost_USE_STATIC_LIBS ON) # only find static libs
set (Boost_USE_STATIC_LIBS OFF) # use dynamically linked libraries
elseif (WINDOWS)
set (Boost_USE_STATIC_LIBS ON) # only find static libs
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") # also requires boost with runtime-link=static
Expand Down Expand Up @@ -265,11 +265,6 @@ elseif (OSX)
mod_vcf
mod_odb
libcurl.a
libbz2.a
libz.a
libssl.a
libcrypto.a
libcares.a
${Boost_LIBRARIES}
${EXT_LIB_PATH}/libodb-sqlite.a
${EXT_LIB_PATH}/libodb.a
Expand Down

0 comments on commit 1edca3e

Please sign in to comment.