Skip to content

Allow libbsoncxx and libmongocxx library names to be changed externally #649

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 8, 2019
Merged

Allow libbsoncxx and libmongocxx library names to be changed externally #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ab7b92
Allow renaming bsoncxx from the outside
eldruin Nov 8, 2019
020a245
Allos renaming libmongocxx from the outside
eldruin Nov 8, 2019
2de7ac6
Adjust blanks for style consistency
eldruin Nov 8, 2019
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
6 changes: 4 additions & 2 deletions src/bsoncxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ option(BSONCXX_POLY_USE_SYSTEM_MNMLSTC "Obtain mnmlstc/core from system" OFF)
option(BSONCXX_POLY_USE_BOOST "Use boost for stdx polyfills" OFF)
option(BSONCXX_POLY_USE_STD "Use C++17 std library for stdx polyfills" OFF)

set(BSONCXX_OUTPUT_BASENAME "bsoncxx" CACHE STRING "Output bsoncxx library base name")

# Count how many polyfill options are true-ish
set(BSONCXX_POLY_OPTIONS_SET 0)
foreach (BSONCXX_POLY_OPTION ${BSONCXX_POLY_USE_MNMLSTC} ${BSONCXX_POLY_USE_STD_EXPERIMENTAL} ${BSONCXX_POLY_USE_BOOST} ${BSONCXX_POLY_USE_STD})
Expand Down Expand Up @@ -120,11 +122,11 @@ endif()
include(BsoncxxUtil)

if(BSONCXX_BUILD_SHARED)
bsoncxx_add_library(bsoncxx_shared "bsoncxx" SHARED)
bsoncxx_add_library(bsoncxx_shared "${BSONCXX_OUTPUT_BASENAME}" SHARED)
endif()

if(BSONCXX_BUILD_STATIC)
bsoncxx_add_library(bsoncxx_static "bsoncxx-static" STATIC)
bsoncxx_add_library(bsoncxx_static "${BSONCXX_OUTPUT_BASENAME}-static" STATIC)
endif()

if(BSONCXX_BUILD_SHARED)
Expand Down
6 changes: 4 additions & 2 deletions src/mongocxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ set(MONGOCXX_ABI_VERSION _noabi)
option(MONGOCXX_ENABLE_SSL "Enable SSL - if the underlying C driver offers it" ON)
option(MONGOCXX_ENABLE_SLOW_TESTS "Run slow tests when invoking the the test target" OFF)

set(MONGOCXX_OUTPUT_BASENAME "mongocxx" CACHE STRING "Output mongocxx library base name")

set(MONGOCXX_VERSION_NO_EXTRA ${MONGOCXX_VERSION_MAJOR}.${MONGOCXX_VERSION_MINOR}.${MONGOCXX_VERSION_PATCH})
set(MONGOCXX_VERSION ${MONGOCXX_VERSION_NO_EXTRA}${MONGOCXX_VERSION_EXTRA})
message ("mongocxx version: ${MONGOCXX_VERSION}")
Expand Down Expand Up @@ -138,12 +140,12 @@ include_directories(
include(MongocxxUtil)

if(MONGOCXX_BUILD_SHARED)
mongocxx_add_library(mongocxx_shared "mongocxx" SHARED)
mongocxx_add_library(mongocxx_shared "${MONGOCXX_OUTPUT_BASENAME}" SHARED)
target_link_libraries(mongocxx_shared PUBLIC bsoncxx_shared)
endif()

if(MONGOCXX_BUILD_STATIC)
mongocxx_add_library(mongocxx_static "mongocxx-static" STATIC)
mongocxx_add_library(mongocxx_static "${MONGOCXX_OUTPUT_BASENAME}-static" STATIC)
target_link_libraries(mongocxx_static PUBLIC bsoncxx_static)
endif()

Expand Down