Skip to content

Commit

Permalink
Remove white spaces and trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
elsid committed Mar 6, 2019
1 parent be57da3 commit e99f783
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions CI/before_script.msvc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ while [ $# -gt 0 ]; do

t )
TEST_FRAMEWORK=true ;;

h )
cat <<EOF
Usage: $0 [-cdehkpuvV]
Expand All @@ -99,8 +99,8 @@ Options:
Keep the old build directory, default is to delete it.
-p <Win32/Win64>
Set the build platform, can also be set with environment variable PLATFORM.
-t
Build unit tests / Google test
-t
Build unit tests / Google test
-u
Configure for unity builds.
-v <2013/2015/2017>
Expand Down Expand Up @@ -402,7 +402,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
download "SDL 2.0.7" \
"https://www.libsdl.org/release/SDL2-devel-2.0.7-VC.zip" \
"SDL2-2.0.7.zip"

# Google test and mock
if [ ! -z $TEST_FRAMEWORK ]; then
echo "Google test 1.8.1..."
Expand Down Expand Up @@ -692,33 +692,33 @@ echo
# Google Test and Google Mock
if [ ! -z $TEST_FRAMEWORK ]; then
printf "Google test 1.8.1 ..."

cd googletest
if [ ! -d build ]; then
mkdir build
fi

cd build

GOOGLE_INSTALL_ROOT="${DEPS_INSTALL}/GoogleTest"
if [ $CONFIGURATION == "Debug" ]; then
DEBUG_SUFFIX="d"
else
DEBUG_SUFFIX=""
fi

if [ ! -d $GOOGLE_INSTALL_ROOT ]; then

cmake .. -DCMAKE_BUILD_TYPE="${CONFIGURATION}" -DCMAKE_INSTALL_PREFIX="${GOOGLE_INSTALL_ROOT}" -DCMAKE_USE_WIN32_THREADS_INIT=1 -G "${GENERATOR}" -DBUILD_SHARED_LIBS=1
cmake --build . --config "${CONFIGURATION}"
cmake --build . --target install --config "${CONFIGURATION}"

add_runtime_dlls "${GOOGLE_INSTALL_ROOT}\bin\gtest_main${DEBUG_SUFFIX}.dll"
add_runtime_dlls "${GOOGLE_INSTALL_ROOT}\bin\gtest${DEBUG_SUFFIX}.dll"
add_runtime_dlls "${GOOGLE_INSTALL_ROOT}\bin\gmock_main${DEBUG_SUFFIX}.dll"
add_runtime_dlls "${GOOGLE_INSTALL_ROOT}\bin\gmock${DEBUG_SUFFIX}.dll"
fi

add_cmake_opts -DBUILD_UNITTESTS=yes
# FindGTest and FindGMock do not work perfectly on Windows
# but we can help them by telling them everything we know about installation
Expand All @@ -730,7 +730,7 @@ if [ ! -z $TEST_FRAMEWORK ]; then
add_cmake_opts -DGMOCK_MAIN_LIBRARY="$GOOGLE_INSTALL_ROOT/lib/gmock_main${DEBUG_SUFFIX}.lib"
add_cmake_opts -DGTEST_LINKED_AS_SHARED_LIBRARY=True
echo Done.

fi

echo
Expand Down

0 comments on commit e99f783

Please sign in to comment.