Skip to content

Allow libbson and libmongoc library names to be changed externally #588

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 libbson and libmongoc library names to be changed externally #588

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
58725f7
Allow renaming libbson from the outside
eldruin Nov 8, 2019
ebd6284
Allow renaming libmongoc from the outside
eldruin Nov 8, 2019
a77c98b
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
18 changes: 10 additions & 8 deletions src/libbson/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ if (ENABLE_TESTS AND NOT ENABLE_STATIC MATCHES "ON|AUTO")
message (FATAL_ERROR "-DENABLE_STATIC=OFF also requires -DENABLE_TESTS=OFF")
endif ()

set (BSON_OUTPUT_BASENAME "bson" CACHE STRING "Output bson library base name")

include (CheckFunctionExists)
include (CheckIncludeFile)
include (CheckStructHasMember)
Expand All @@ -22,7 +24,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/../../build/cm
include (LoadVersion)
LoadVersion (${PROJECT_SOURCE_DIR}/../../VERSION_CURRENT BSON)

message ("libbson version (from VERSION_CURRENT file): ${BSON_VERSION}")
message ("lib${BSON_OUTPUT_BASENAME} version (from VERSION_CURRENT file): ${BSON_VERSION}")

set (BSON_API_VERSION 1.0)

Expand Down Expand Up @@ -218,16 +220,16 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden)
target_compile_definitions (bson_shared PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN)
target_include_directories (bson_shared INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>)
set_target_properties (bson_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
set_target_properties (bson_shared PROPERTIES OUTPUT_NAME "bson-${BSON_API_VERSION}" PREFIX "lib")
set_target_properties (bson_shared PROPERTIES OUTPUT_NAME "${BSON_OUTPUT_BASENAME}-${BSON_API_VERSION}" PREFIX "lib")

if (ENABLE_APPLE_FRAMEWORK)
set_target_properties(bson_shared PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION}
set_target_properties(bson_shared PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION}
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MONGOC_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.mongodb.bson
OUTPUT_NAME "bson"
PUBLIC_HEADER "${HEADERS}"
OUTPUT_NAME "${BSON_OUTPUT_BASENAME}"
PUBLIC_HEADER "${HEADERS}"
)
endif ()

Expand Down Expand Up @@ -264,7 +266,7 @@ if (ENABLE_STATIC MATCHES "ON|AUTO")
)
target_include_directories (bson_static INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>)
set_target_properties (bson_static PROPERTIES VERSION 0.0.0)
set_target_properties (bson_static PROPERTIES OUTPUT_NAME "bson-static-${BSON_API_VERSION}")
set_target_properties (bson_static PROPERTIES OUTPUT_NAME "${BSON_OUTPUT_BASENAME}-static-${BSON_API_VERSION}")
# We use CMAKE_THREAD_LIBS_INIT rather than Threads::Threads here because the
# latter fails when building on Mac OS X
target_link_libraries (bson_static ${CMAKE_THREAD_LIBS_INIT})
Expand Down
16 changes: 9 additions & 7 deletions src/libmongoc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ set (MONGOC_ENABLE_COMPRESSION_SNAPPY 0)
set (MONGOC_ENABLE_COMPRESSION_ZLIB 0)
set (MONGOC_ENABLE_COMPRESSION_ZSTD 0)

set (MONGOC_OUTPUT_BASENAME "mongoc" CACHE STRING "Output mongoc library base name")

if (ENABLE_COVERAGE)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g --coverage")
endif ()
Expand Down Expand Up @@ -683,7 +685,7 @@ target_include_directories (mongoc_shared PRIVATE ${PRIVATE_ZLIB_INCLUDES})
target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION)

set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "mongoc-${MONGOC_API_VERSION}" PREFIX "lib")
set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}" PREFIX "lib")

if (MONGOC_ENABLE_STATIC)
add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING})
Expand All @@ -695,17 +697,17 @@ if (MONGOC_ENABLE_STATIC)
PRIVATE MONGOC_COMPILATION
)
set_target_properties (mongoc_static PROPERTIES VERSION 0.0.0)
set_target_properties (mongoc_static PROPERTIES OUTPUT_NAME "mongoc-static-${MONGOC_API_VERSION}")
set_target_properties (mongoc_static PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-static-${MONGOC_API_VERSION}")
endif ()

if (ENABLE_APPLE_FRAMEWORK)
set_target_properties (mongoc_shared PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION}
set_target_properties (mongoc_shared PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION}
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MONGOC_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.mongodb.mongoc
OUTPUT_NAME "mongoc"
PUBLIC_HEADER "${HEADERS}"
OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}"
PUBLIC_HEADER "${HEADERS}"
)
endif ()

Expand Down