Skip to content

Commit 34b3b22

Browse files
kevinAlbskevinAlbs
committed
CDRIVER-2505 default bundled libbson
1 parent 797d0ba commit 34b3b22

11 files changed

+21
-23
lines changed

‎.evergreen/check-release-archive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sphinx-build --version
1717
DIR=$(dirname $0)
1818
. $DIR/find-cmake.sh
1919

20-
$CMAKE -DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON -DENABLE_ZLIB=BUNDLED -DENABLE_BSON=BUNDLED .
20+
$CMAKE -DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON -DENABLE_ZLIB=BUNDLED -DENABLE_BSON=ON .
2121
make -j 8 distcheck
2222

2323
# Check that docs were included, but sphinx temp files weren't.

‎.evergreen/compile-unix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ echo "OS: $OS"
6060
# CMAKE_SKIP_RPATH avoids hardcoding absolute paths to dependency libraries.
6161
DEBUG_AND_RELEASE_FLAGS="\
6262
-DCMAKE_SKIP_RPATH=TRUE \
63-
-DENABLE_BSON=BUNDLED \
63+
-DENABLE_BSON=ON \
6464
-DENABLE_MAN_PAGES=OFF \
6565
-DENABLE_HTML_DOCS=OFF \
6666
-DENABLE_MAINTAINER_FLAGS=ON \

‎.evergreen/compile-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CONFIGURE_FLAGS="\
1616
-DCMAKE_PREFIX_PATH=${INSTALL_DIR} \
1717
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP:BOOL=OFF \
1818
-DENABLE_MAINTAINER_FLAGS=ON \
19-
-DENABLE_BSON=BUNDLED"
19+
-DENABLE_BSON=ON"
2020
BUILD_FLAGS="/m" # Number of concurrent processes. No value=# of cpus
2121
CMAKE="/cygdrive/c/cmake/bin/cmake"
2222
CC=${CC:-"Visual Studio 14 2015 Win64"}

‎.evergreen/link-sample-program-bson.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ $TAR xf ../../mongoc.tar.gz -C . --strip-components=1
4343

4444
if [ "$LINK_STATIC" ]; then
4545
# Our CMake system builds shared and static by default.
46-
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=BUNDLED .
46+
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON .
4747
make
4848
make install
4949
else
50-
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=BUNDLED -DENABLE_STATIC=OFF .
50+
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON -DENABLE_STATIC=OFF .
5151
make
5252
make install
5353

‎.evergreen/link-sample-program-mingw-bson.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd %BUILD_DIR%
2929
%TAR% xf ..\..\mongoc.tar.gz -C . --strip-components=1
3030

3131
rem Build libmongoc, with flags that the downstream R driver mongolite uses
32-
%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-std=c99 -pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DENABLE_BSON=BUNDLED -DENABLE_STATIC=ON .
32+
%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-std=c99 -pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DENABLE_BSON=ON -DENABLE_STATIC=ON .
3333
%CMAKE_MAKE_PROGRAM%
3434
if errorlevel 1 (
3535
exit /B 1

‎.evergreen/link-sample-program-mingw.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd %BUILD_DIR%
2929
%TAR% xf ..\..\mongoc.tar.gz -C . --strip-components=1
3030

3131
rem Build libmongoc, with flags that the downstream R driver mongolite uses
32-
%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-std=c99 -pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake %CMAKE_FLAGS% -DENABLE_BSON=BUNDLED .
32+
%CMAKE% -G "MinGW Makefiles" -DCMAKE_MAKE_PROGRAM=%CMAKE_MAKE_PROGRAM% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_CFLAGS="-std=c99 -pedantic" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake %CMAKE_FLAGS% -DENABLE_BSON=ON .
3333
%CMAKE_MAKE_PROGRAM%
3434
if errorlevel 1 (
3535
exit /B 1

‎.evergreen/link-sample-program-msvc-bson.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ cd %BUILD_DIR%
2727
%TAR% xf ..\..\mongoc.tar.gz -C . --strip-components=1
2828

2929
if "%LINK_STATIC%"=="1" (
30-
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_BSON=BUNDLED .
30+
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_BSON=ON .
3131
) else (
32-
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_BSON=BUNDLED -DENABLE_STATIC=OFF .
32+
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_BSON=ON -DENABLE_STATIC=OFF .
3333
)
3434

3535
msbuild.exe /m ALL_BUILD.vcxproj

‎.evergreen/link-sample-program-msvc.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ if "%ENABLE_SNAPPY%"=="1" (
4444
cd %BUILD_DIR%
4545
rem Build libmongoc
4646
if "%ENABLE_SSL%"=="1" (
47-
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_BSON=BUNDLED -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% .
47+
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_BSON=ON -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% .
4848
) else (
49-
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_BSON=BUNDLED -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% .
49+
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_BSON=ON -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% .
5050
)
5151

5252
msbuild.exe /m ALL_BUILD.vcxproj

‎.evergreen/link-sample-program.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ else
7272
fi
7373

7474

75-
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=BUNDLED .
75+
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=ON .
7676
make
7777
make install
7878

‎CMakeLists.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ option (ENABLE_TRACING "Turn on verbose debug output" OFF)
3434
option (ENABLE_COVERAGE "Turn on compile options for lcov" OFF)
3535
set (ENABLE_SHM_COUNTERS AUTO CACHE STRING "Enable memory performance counters that use shared memory on Linux. Set to ON/AUTO/OFF, default AUTO.")
3636
set (ENABLE_MONGOC ON CACHE STRING "Whether to build libmongoc. Set to ON/OFF, default ON.")
37-
set (ENABLE_BSON AUTO CACHE STRING "Whether to build libbson. Set to ON/AUTO/OFF, default AUTO.")
37+
set (ENABLE_BSON AUTO CACHE STRING "Whether to build libbson. Set to ON/AUTO/SYSTEM, default AUTO.")
3838
set (ENABLE_SNAPPY AUTO CACHE STRING "Enable snappy support. Set to ON/AUTO/OFF, default AUTO.")
3939
set (ENABLE_ZLIB AUTO CACHE STRING "Enable zlib support")
4040
option (ENABLE_MAN_PAGES "Build MongoDB C Driver manual pages." OFF)
@@ -87,15 +87,11 @@ if (NOT ENABLE_MONGOC MATCHES "ON|OFF")
8787
message (FATAL_ERROR "ENABLE_MONGOC option must be ON or OFF")
8888
endif ()
8989

90-
if (NOT ENABLE_BSON MATCHES "ON|AUTO|OFF|SYSTEM|BUNDLED")
91-
message (FATAL_ERROR "ENABLE_BSON option must be ON, AUTO, or OFF")
90+
if (NOT ENABLE_BSON MATCHES "ON|AUTO|SYSTEM")
91+
message (FATAL_ERROR "ENABLE_BSON option must be ON, AUTO, or SYSTEM")
9292
endif ()
9393

94-
if (ENABLE_MONGOC STREQUAL OFF AND ENABLE_BSON MATCHES "OFF|SYSTEM")
95-
message (FATAL_ERROR "At least one of ENABLE_BSON and ENABLE_MONGOC must be ON")
96-
endif ()
97-
98-
if (NOT ENABLE_BSON STREQUAL BUNDLED)
94+
if (ENABLE_BSON STREQUAL SYSTEM)
9995
# The input variable BSON_ROOT_DIR is respected for backwards compatibility,
10096
# but you should use the standard CMAKE_PREFIX_PATH instead.
10197
message (STATUS "Searching for libbson CMake packages")
@@ -112,6 +108,8 @@ if (NOT ENABLE_BSON STREQUAL BUNDLED)
112108
message ("-- libbson found version \"${BSON_VERSION}\"")
113109
message ("-- libbson include path \"${BSON_INCLUDE_DIRS}\"")
114110
message ("-- libbson libraries \"${BSON_LIBRARIES}\"")
111+
message ("-- disabling test-libmongoc since using system libbson")
112+
SET (ENABLE_TESTS OFF)
115113

116114
if (ENABLE_STATIC MATCHES "ON|AUTO")
117115
find_package (libbson-static-1.0
@@ -156,7 +154,7 @@ if (NOT BSON_LIBRARIES)
156154
endif ()
157155

158156
# This allows skipping all the non-bson components
159-
if (ENABLE_MONGOC STREQUAL OFF OR ENABLE_BSON STREQUAL ONLY)
157+
if (ENABLE_MONGOC STREQUAL OFF)
160158
return ()
161159
endif ()
162160

@@ -295,7 +293,7 @@ add_custom_command (OUTPUT ${DIST_FILE}
295293
${ALL_DIST} ${dist_generated_depends}
296294
)
297295

298-
if (ENABLE_BSON MATCHES "ON|BUNDLED" AND ENABLE_MAN_PAGES STREQUAL ON AND ENABLE_HTML_DOCS STREQUAL ON)
296+
if (ENABLE_BSON MATCHES "ON|AUTO" AND ENABLE_MAN_PAGES STREQUAL ON AND ENABLE_HTML_DOCS STREQUAL ON)
299297
# Since our 'dist' implementation does not add top-level targets for every
300298
# file to be included, we declare a dependency on the 'mongo-doc' target so
301299
# that documentation is built before the distribution tarball is generated.

0 commit comments

Comments
 (0)