Skip to content

CXX-2971 Fix bsoncxx package name in pkg-config requires field #1103

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
Feb 29, 2024
Merged

CXX-2971 Fix bsoncxx package name in pkg-config requires field #1103

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
7e79675
Depend on CMake to handle quoting of command-line arguments correctly
eramongodb Feb 29, 2024
911f520
CXX-2971 Fix bsoncxx package name in pkg-config requires list
eramongodb Feb 29, 2024
f330d56
Address "argument isn't numeric in numeric comparison" pkg-config war…
eramongodb Feb 29, 2024
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
16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,16 +438,16 @@ install(FILES LICENSE README.md THIRD-PARTY-NOTICES
# This is the command that produces the distribution tarball
add_custom_command(OUTPUT ${DIST_FILE}
COMMAND ${CMAKE_COMMAND}
-D CMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake/make_dist
-D PACKAGE_PREFIX=${PACKAGE_PREFIX}
-D MONGOCXX_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-D BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}
-D SHELL=${SHELL}
"-Ddist_generated=\"${dist_generated}\""
-P ${PROJECT_SOURCE_DIR}/cmake/make_dist/MakeDist.cmake
-D "CMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake/make_dist"
-D "PACKAGE_PREFIX=${PACKAGE_PREFIX}"
-D "MONGOCXX_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
-D "BUILD_SOURCE_DIR=${BUILD_SOURCE_DIR}"
-D "SHELL=${SHELL}"
-D "dist_generated=${dist_generated}"
-P ${PROJECT_SOURCE_DIR}/cmake/make_dist/MakeDist.cmake

DEPENDS
${ALL_DIST} ${dist_generated_depends}
${ALL_DIST} ${dist_generated_depends}
)

if(NOT(TARGET dist OR TARGET distcheck))
Expand Down
22 changes: 11 additions & 11 deletions src/bsoncxx/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@ if(1)
add_custom_command(
OUTPUT ${pcfilename}
COMMAND ${CMAKE_COMMAND}
-D src_dir="${CMAKE_CURRENT_SOURCE_DIR}"
-D bin_dir="${CMAKE_CURRENT_BINARY_DIR}"
-D prefix="${CMAKE_INSTALL_PREFIX}"
-D includedir="${CMAKE_INSTALL_INCLUDEDIR}"
-D libdir="${CMAKE_INSTALL_LIBDIR}"
-D output_name="${output_name}"
-D version="${BSONCXX_VERSION}"
-D is_static="${is_static}"
-D libbson_req_abi_ver="${LIBBSON_REQUIRED_ABI_VERSION}"
-D libbson_req_ver="${LIBBSON_REQUIRED_VERSION}"
-D mnmlstc_enabled="${BSONCXX_POLY_MNMLSTC_ENABLED}"
-D "src_dir=${CMAKE_CURRENT_SOURCE_DIR}"
-D "bin_dir=${CMAKE_CURRENT_BINARY_DIR}"
-D "prefix=${CMAKE_INSTALL_PREFIX}"
-D "includedir=${CMAKE_INSTALL_INCLUDEDIR}"
-D "libdir=${CMAKE_INSTALL_LIBDIR}"
-D "output_name=${output_name}"
-D "version=${BSONCXX_VERSION_NO_EXTRA}"
-D "is_static=${is_static}"
-D "libbson_req_abi_ver=${LIBBSON_REQUIRED_ABI_VERSION}"
-D "libbson_req_ver=${LIBBSON_REQUIRED_VERSION}"
-D "mnmlstc_enabled=${BSONCXX_POLY_MNMLSTC_ENABLED}"
-P ${CMAKE_CURRENT_SOURCE_DIR}/generate-pc.cmake
MAIN_DEPENDENCY
${CMAKE_CURRENT_SOURCE_DIR}/libbsoncxx.pc.in
Expand Down
42 changes: 26 additions & 16 deletions src/mongocxx/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,38 @@ if(1)

set(pcfilename "${CMAKE_CURRENT_BINARY_DIR}/lib${output_name}.pc")

if(LINK_TYPE STREQUAL "STATIC")
get_target_property(bsoncxx_name bsoncxx_static OUTPUT_NAME)
set(is_static 1)
if (ENABLE_ABI_TAG_IN_PKGCONFIG_FILENAMES)
if(LINK_TYPE STREQUAL "STATIC")
get_target_property(bsoncxx_name bsoncxx_static OUTPUT_NAME)
set(is_static 1)
else()
get_target_property(bsoncxx_name bsoncxx_shared OUTPUT_NAME)
set(is_static 0)
endif()
else()
get_target_property(bsoncxx_name bsoncxx_shared OUTPUT_NAME)
set(is_static 0)
if(LINK_TYPE STREQUAL "STATIC")
set(bsoncxx_name "$CACHE{BSONCXX_OUTPUT_BASENAME}-static")
set(is_static 1)
else()
set(bsoncxx_name "$CACHE{BSONCXX_OUTPUT_BASENAME}")
set(is_static 0)
endif()
endif()

add_custom_command(
OUTPUT ${pcfilename}
COMMAND ${CMAKE_COMMAND}
-D src_dir="${CMAKE_CURRENT_SOURCE_DIR}"
-D bin_dir="${CMAKE_CURRENT_BINARY_DIR}"
-D prefix="${CMAKE_INSTALL_PREFIX}"
-D includedir="${CMAKE_INSTALL_INCLUDEDIR}"
-D libdir="${CMAKE_INSTALL_LIBDIR}"
-D output_name="${output_name}"
-D version="${MONGOCXX_VERSION}"
-D is_static="${is_static}"
-D bsoncxx_name="${bsoncxx_name}"
-D libmongoc_req_abi_ver="${LIBMONGOC_REQUIRED_ABI_VERSION}"
-D libmongoc_req_ver="${LIBMONGOC_REQUIRED_VERSION}"
-D "src_dir=${CMAKE_CURRENT_SOURCE_DIR}"
-D "bin_dir=${CMAKE_CURRENT_BINARY_DIR}"
-D "prefix=${CMAKE_INSTALL_PREFIX}"
-D "includedir=${CMAKE_INSTALL_INCLUDEDIR}"
-D "libdir=${CMAKE_INSTALL_LIBDIR}"
-D "output_name=${output_name}"
-D "version=${MONGOCXX_VERSION_NO_EXTRA}"
-D "is_static=${is_static}"
-D "bsoncxx_name=${bsoncxx_name}"
-D "libmongoc_req_abi_ver=${LIBMONGOC_REQUIRED_ABI_VERSION}"
-D "libmongoc_req_ver=${LIBMONGOC_REQUIRED_VERSION}"
-P ${CMAKE_CURRENT_SOURCE_DIR}/generate-pc.cmake
MAIN_DEPENDENCY
${CMAKE_CURRENT_SOURCE_DIR}/libmongocxx.pc.in
Expand Down