File tree Expand file tree Collapse file tree 1 file changed +9
-11
lines changed Expand file tree Collapse file tree 1 file changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -112,17 +112,14 @@ function check_exit_code {
112112 fi
113113}
114114
115- CMAKE_OPTIONS=
115+ CMAKE_OPTIONS=" -DFIREBASE_UNITY_BUILD_TESTS=ON"
116+ CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DFIREBASE_CPP_BUILD_STUB_TESTS=ON" # enable a stub gtest target to get abseil-cpp working.
116117
117118if [ -d " ../firebase-cpp-sdk" ]; then
118119 REAL_PATH=` python -c " import os; print(os.path.realpath('../firebase-cpp-sdk'))" `
119- CMAKE_OPTIONS=" -DFIREBASE_CPP_SDK_DIR=$REAL_PATH "
120+ CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DFIREBASE_CPP_SDK_DIR=$REAL_PATH "
120121fi
121122
122- CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DUNITY_ROOT_DIR=${UNITY_ROOT_DIR} "
123- CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DFIREBASE_UNITY_BUILD_TESTS=ON"
124- CMAKE_OPTIONS=" ${CMAKE_OPTIONS} -DFIREBASE_CPP_BUILD_STUB_TESTS=ON" # enable a stub gtest target to get abseil-cpp working.
125-
126123# Display commands being run.
127124set -x
128125
@@ -132,14 +129,15 @@ mkdir -p "$buildpath"
132129pushd " $buildpath "
133130
134131 # Configure cmake with option value
135- cmake ${sourcepath} -DCMAKE_TOOLCHAIN_FILE=${sourcepath} /cmake/unity_ios.cmake -DCMAKE_OSX_ARCHITECTURES=$SUPPORTED_ARCHITECTURES ${CMAKE_OPTIONS} ${cmake_extra}
132+ cmake $sourcepath \
133+ -DCMAKE_TOOLCHAIN_FILE=$sourcepath /cmake/unity_ios.cmake \
134+ -DCMAKE_OSX_ARCHITECTURES=$SUPPORTED_ARCHITECTURES \
135+ -DUNITY_ROOT_DIR=${UNITY_ROOT_DIR} \
136+ $CMAKE_OPTIONS \
137+ $cmake_extra
136138 check_exit_code $?
137139
138140 # Build the SDK
139- # using make -j <nprocs> is having some issues where the build hangs
140- # and continues on pressing return only to stop sometime later.
141- # Disabling parallel builds for now.
142- # TODO: Enable parallel builds after finding the reason
143141 make
144142 check_exit_code $?
145143
You can’t perform that action at this time.
0 commit comments