Skip to content

CXX-2753 Refactor CMake config files to reflect new directory structure #1037

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 12 commits into from
Oct 19, 2023
Merged

CXX-2753 Refactor CMake config files to reflect new directory structure #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d58c32
Use CMAKE_BUILD_PARALLEL_LEVEL in compile.sh
eramongodb Sep 22, 2023
36047e9
Group minimum C Driver library version variables
eramongodb Sep 22, 2023
592864c
Format CMake config files
eramongodb Sep 22, 2023
8bc669a
Move package config commands into cmake/CMakeLists.txt
eramongodb Sep 22, 2023
48d3a45
Move header commands into include/CMakeLists.txt
eramongodb Sep 22, 2023
0b7246b
Move lib commands into lib/CMakeLists.txt
eramongodb Sep 22, 2023
8260ccc
Move example variables into example config files
eramongodb Sep 22, 2023
f375b3e
Move test commands into test/CMakeLists.txt
eramongodb Sep 25, 2023
69f81ca
Update modeless message() commands to STATUS mode
eramongodb Sep 26, 2023
0f81758
Fix reference to mongocxx-config.cmake.in
eramongodb Oct 11, 2023
883ddf8
Move targets file generate and install into cmake subdir
eramongodb Oct 11, 2023
7cd811b
Merge remote-tracking branch 'upstream/master' into cxx-2753
eramongodb Oct 11, 2023
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
10 changes: 5 additions & 5 deletions .evergreen/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ fi
OS=$(uname -s | tr '[:upper:]' '[:lower:]')

if [ -f /proc/cpuinfo ]; then
CONCURRENCY=$(grep -c ^processor /proc/cpuinfo)
CMAKE_BUILD_PARALLEL_LEVEL=$(grep -c ^processor /proc/cpuinfo)
elif which sysctl; then
CONCURRENCY=$(sysctl -n hw.logicalcpu)
CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
else
echo "$0: can't figure out what value of -j to pass to 'make'" >&2
echo "$0: can't figure out what build parallel level to use" >&2
exit 1
fi
export CMAKE_BUILD_PARALLEL_LEVEL

case "$OS" in
darwin|linux)
GENERATOR=${GENERATOR:-"Unix Makefiles"}
CMAKE_BUILD_OPTS="-j $CONCURRENCY"
CMAKE_EXAMPLES_TARGET=examples
if [ "$RUN_DISTCHECK" ]; then
_RUN_DISTCHECK=$RUN_DISTCHECK
Expand All @@ -39,7 +39,7 @@ case "$OS" in

cygwin*)
GENERATOR=${GENERATOR:-"Visual Studio 14 2015 Win64"}
CMAKE_BUILD_OPTS="/verbosity:minimal /maxcpucount:$CONCURRENCY"
CMAKE_BUILD_OPTS="/verbosity:minimal"
CMAKE_EXAMPLES_TARGET=examples/examples
;;

Expand Down
7 changes: 6 additions & 1 deletion .mci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,12 @@ functions:
export LD_LIBRARY_PATH=.:$PREFIX/lib/
export DYLD_LIBRARY_PATH=.:$PREFIX/lib/
fi
export PATH=$(pwd)/src/bsoncxx/${build_type}:$(pwd)/src/mongocxx/${build_type}:$PREFIX/bin:$(pwd)/install/bin:$PATH
PATH="$(pwd)/src/mongocxx/test/${build_type}:$PATH"
PATH="$(pwd)/src/bsoncxx/test/${build_type}:$PATH"
PATH="$(pwd)/src/mongocxx/${build_type}:$PATH"
PATH="$(pwd)/src/bsoncxx/${build_type}:$PATH"
PATH="$PREFIX/bin:$PATH"
PATH="$(pwd)/install/bin:$PATH"

export CHANGE_STREAMS_UNIFIED_TESTS_PATH="$(pwd)/../data/change-streams/unified"
export CLIENT_SIDE_ENCRYPTION_LEGACY_TESTS_PATH="$(pwd)/../data/client_side_encryption/legacy"
Expand Down
Loading