File tree Expand file tree Collapse file tree 4 files changed +29
-4
lines changed Expand file tree Collapse file tree 4 files changed +29
-4
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,15 @@ compile_libmongocrypt() {
20
20
" -DBUILD_VERSION=1.12.0"
21
21
)
22
22
23
+ . " $( dirname " ${BASH_SOURCE[0]} " ) /find-ccache.sh"
24
+ find_ccache_and_export_vars " $( pwd) /libmongocrypt" || true
25
+ if command -v " ${CMAKE_C_COMPILER_LAUNCHER:- } " && [[ " ${OSTYPE:? } " == cygwin ]]; then
26
+ crypt_cmake_flags+=(
27
+ " -DCMAKE_POLICY_DEFAULT_CMP0141=NEW"
28
+ " -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded"
29
+ )
30
+ fi
31
+
23
32
env \
24
33
DEBUG=" 0" \
25
34
CMAKE_EXE=" ${cmake_binary} " \
Original file line number Diff line number Diff line change @@ -131,12 +131,16 @@ echo "Installing libmongocrypt..."
131
131
}
132
132
echo " Installing libmongocrypt... done."
133
133
134
- echo " CFLAGS: ${CFLAGS} "
135
- echo " configure_flags: ${configure_flags[*]} "
136
-
137
134
# Use ccache if able.
138
135
. " ${script_dir:? } /find-ccache.sh"
139
136
find_ccache_and_export_vars " $( pwd) " || true
137
+ if command -v " ${CMAKE_C_COMPILER_LAUNCHER:- } " && [[ " ${OSTYPE:? } " == cygwin ]]; then
138
+ configure_flags_append " -DCMAKE_POLICY_DEFAULT_CMP0141=NEW"
139
+ configure_flags_append " -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>"
140
+ fi
141
+
142
+ echo " CFLAGS: ${CFLAGS} "
143
+ echo " configure_flags: ${configure_flags[*]} "
140
144
141
145
" ${cmake_binary} " " ${configure_flags[@]} " .
142
146
" ${cmake_binary} " --build .
Original file line number Diff line number Diff line change @@ -134,6 +134,14 @@ if [ "${COMPILE_LIBMONGOCRYPT}" = "ON" ]; then
134
134
configure_flags_append " -DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
135
135
fi
136
136
137
+ # Use ccache if able.
138
+ . " ${script_dir:? } /find-ccache.sh"
139
+ find_ccache_and_export_vars " $( pwd) " || true
140
+ if command -v " ${CMAKE_C_COMPILER_LAUNCHER:- } " && [[ " ${OSTYPE:? } " == cygwin ]]; then
141
+ configure_flags_append " -DCMAKE_POLICY_DEFAULT_CMP0141=NEW"
142
+ configure_flags_append " -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>"
143
+ fi
144
+
137
145
" ${cmake_binary:? } " -S . -B " ${build_dir:? } " -G " $CC " " ${configure_flags[@]} " " ${extra_configure_flags[@]} "
138
146
" ${cmake_binary:? } " --build " ${build_dir:? } " --config " ${build_config:? } "
139
147
" ${cmake_binary:? } " --install " ${build_dir:? } " --config " ${build_config:? } "
147
155
if [[ " $EXTRA_CONFIGURE_FLAGS " != * " ENABLE_MONGOC=OFF" * ]]; then
148
156
# Check public headers for extra warnings.
149
157
" ${cmake_binary:? } " --build " ${build_dir:? } " --config " ${build_config:? } " --target public-header-warnings
150
- fi
158
+ fi
Original file line number Diff line number Diff line change @@ -76,6 +76,10 @@ ZSTD="AUTO"
76
76
if [[ -f $DIR /find-ccache.sh ]]; then
77
77
. $DIR /find-ccache.sh
78
78
find_ccache_and_export_vars " $SCRATCH_DIR " || true
79
+ if command -v " ${CMAKE_C_COMPILER_LAUNCHER:- } " && [[ " ${OSTYPE:? } " == cygwin ]]; then
80
+ configure_flags_append " -DCMAKE_POLICY_DEFAULT_CMP0141=NEW"
81
+ configure_flags_append " -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>"
82
+ fi
79
83
fi
80
84
81
85
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR /lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_ZSTD=$ZSTD " $SCRATCH_DIR "
You can’t perform that action at this time.
0 commit comments