Skip to content

Commit

Permalink
FreeBSD/Cmake/Boost: Build with SYSTEM Boost on FreeBSD
Browse files Browse the repository at this point in the history
 - The in tree Boost needs patching to be FreeBSD compatible.
   Which is not trivial ATM.
 - And set the required version to 1.5 since forwarding it to
   1.161 requires quite some labour in patching the package

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
  • Loading branch information
wjwithagen committed Nov 12, 2016
1 parent c88c395 commit 661f745
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Expand Up @@ -461,7 +461,12 @@ if(WITH_MGR)
endif()

# require minimally the bundled version
find_package(Boost 1.61 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
if (NOT FREEBSD)
find_package(Boost 1.61 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
else
# FreeBSD currently packages 1.55, forwarding is less than trivial
find_package(Boost 1.55 COMPONENTS thread system regex random program_options date_time iostreams REQUIRED)
endif()
include_directories(${Boost_INCLUDE_DIRS})
include_directories(${PROJECT_BINARY_DIR}/include)

Expand Down
1 change: 1 addition & 0 deletions do_freebsd.sh
Expand Up @@ -15,6 +15,7 @@ rm -rf build && ./do_cmake.sh "$*" \
-D CMAKE_CXX_FLAGS_DEBUG="-O0 -g" \
-D CMAKE_C_FLAGS_DEBUG="-O0 -g" \
-D ENABLE_GIT_VERSION=OFF \
-D WITH_SYSTEM_BOOST=ON \
-D WITH_BLKID=OFF \
-D WITH_LTTNG=OFF \
-D WITH_FUSE=OFF \
Expand Down

0 comments on commit 661f745

Please sign in to comment.