diff --git a/platforms/test/.gitignore b/platforms/test/.gitignore
index 7b1f5ec..d51dda6 100644
--- a/platforms/test/.gitignore
+++ b/platforms/test/.gitignore
@@ -1,3 +1,3 @@
 gtest_i386/
-googletest/generated
+googletest/**/generated/
 
diff --git a/platforms/test/build-googletest.sh b/platforms/test/build-googletest.sh
index ed1742c..86f54a0 100755
--- a/platforms/test/build-googletest.sh
+++ b/platforms/test/build-googletest.sh
@@ -1,9 +1,9 @@
-00#!/bin/sh
+#!/bin/sh
 set -x
 SCRIPTDIR=$(dirname "$0")
-OUTDIR = "$1"
+OUTDIR="$1"
 cd "$SCRIPTDIR"/googletest
-cmake -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_INSTALL_PREFIX:PATH="../"$OUTDIR" .
+cmake -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_INSTALL_PREFIX:PATH="../$OUTDIR" .
 make -j8 && make install
 rm install_manifest.txt
 
diff --git a/platforms/test/googletest/googletest/generated/GTestConfig.cmake b/platforms/test/googletest/googletest/generated/GTestConfig.cmake
deleted file mode 100644
index 771cb7e..0000000
--- a/platforms/test/googletest/googletest/generated/GTestConfig.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-####### Any changes to this file will be overwritten by the next CMake run ####
-####### The input file was Config.cmake.in                            ########
-
-get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
-
-macro(set_and_check _var _file)
-  set(${_var} "${_file}")
-  if(NOT EXISTS "${_file}")
-    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
-  endif()
-endmacro()
-
-macro(check_required_components _NAME)
-  foreach(comp ${${_NAME}_FIND_COMPONENTS})
-    if(NOT ${_NAME}_${comp}_FOUND)
-      if(${_NAME}_FIND_REQUIRED_${comp})
-        set(${_NAME}_FOUND FALSE)
-      endif()
-    endif()
-  endforeach()
-endmacro()
-
-####################################################################################
-include(CMakeFindDependencyMacro)
-if (ON)
-  set(THREADS_PREFER_PTHREAD_FLAG )
-  find_dependency(Threads)
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/GTestTargets.cmake")
-check_required_components("")
diff --git a/platforms/test/googletest/googletest/generated/GTestConfigVersion.cmake b/platforms/test/googletest/googletest/generated/GTestConfigVersion.cmake
deleted file mode 100644
index 7621f3a..0000000
--- a/platforms/test/googletest/googletest/generated/GTestConfigVersion.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is a basic version file for the Config-mode of find_package().
-# It is used by write_basic_package_version_file() as input file for configure_file()
-# to create a version-file which can be installed along a config.cmake file.
-#
-# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-# the requested version string are exactly the same and it sets
-# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
-# The variable CVF_VERSION must be set before calling configure_file().
-
-set(PACKAGE_VERSION "1.10.0")
-
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "4" STREQUAL "")
-   return()
-endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "4")
-   math(EXPR installedBits "4 * 8")
-   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-   set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
diff --git a/platforms/test/googletest/googletest/generated/gmock.pc b/platforms/test/googletest/googletest/generated/gmock.pc
deleted file mode 100644
index be25e86..0000000
--- a/platforms/test/googletest/googletest/generated/gmock.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-libdir=../gtest_i386/lib
-includedir=../gtest_i386/include
-
-Name: gmock
-Description: GoogleMock (without main() function)
-Version: 1.10.0
-URL: https://github.com/google/googletest
-Requires: gtest
-Libs: -L${libdir} -lgmock -lpthread
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
diff --git a/platforms/test/googletest/googletest/generated/gmock_main.pc b/platforms/test/googletest/googletest/generated/gmock_main.pc
deleted file mode 100644
index ec59780..0000000
--- a/platforms/test/googletest/googletest/generated/gmock_main.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-libdir=../gtest_i386/lib
-includedir=../gtest_i386/include
-
-Name: gmock_main
-Description: GoogleMock (with main() function)
-Version: 1.10.0
-URL: https://github.com/google/googletest
-Requires: gmock
-Libs: -L${libdir} -lgmock_main -lpthread
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
diff --git a/platforms/test/googletest/googletest/generated/gtest.pc b/platforms/test/googletest/googletest/generated/gtest.pc
deleted file mode 100644
index b9a5a0c..0000000
--- a/platforms/test/googletest/googletest/generated/gtest.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-libdir=../gtest_i386/lib
-includedir=../gtest_i386/include
-
-Name: gtest
-Description: GoogleTest (without main() function)
-Version: 1.10.0
-URL: https://github.com/google/googletest
-Libs: -L${libdir} -lgtest -lpthread
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
diff --git a/platforms/test/googletest/googletest/generated/gtest_main.pc b/platforms/test/googletest/googletest/generated/gtest_main.pc
deleted file mode 100644
index a341188..0000000
--- a/platforms/test/googletest/googletest/generated/gtest_main.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-libdir=../gtest_i386/lib
-includedir=../gtest_i386/include
-
-Name: gtest_main
-Description: GoogleTest (with main() function)
-Version: 1.10.0
-URL: https://github.com/google/googletest
-Requires: gtest
-Libs: -L${libdir} -lgtest_main -lpthread
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1