Merge branch 'master' into fix_linkage

Author: kimkulling

contrib/googletest-1.10.x/googletest/generated/GTestConfig.cmake

@@ -24,7 +24,7 @@ endmacro()
 
 ####################################################################################
 include(CMakeFindDependencyMacro)
-if (ON)
+if ()
   set(THREADS_PREFER_PTHREAD_FLAG )
   find_dependency(Threads)
 endif()

contrib/googletest-1.10.x/googletest/generated/GTestConfigVersion.cmake

@@ -30,11 +30,6 @@ else()
 endif()
 
 
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-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 "8" STREQUAL "")
   return()

contrib/googletest-1.10.x/googletest/generated/gmock.pc

@@ -1,10 +1,10 @@
-libdir=/usr/local/lib
-includedir=/usr/local/include
+libdir=C:/Program Files (x86)/osre/lib
+includedir=C:/Program Files (x86)/osre/include
 
 Name: gmock
 Description: GoogleMock (without main() function)
 Version: 1.14.0
 URL: https://github.com/google/googletest
 Requires: gtest = 1.14.0
 Libs: -L${libdir} -lgmock 
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
+Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0

contrib/googletest-1.10.x/googletest/generated/gmock_main.pc

@@ -1,10 +1,10 @@
-libdir=/usr/local/lib
-includedir=/usr/local/include
+libdir=C:/Program Files (x86)/osre/lib
+includedir=C:/Program Files (x86)/osre/include
 
 Name: gmock_main
 Description: GoogleMock (with main() function)
 Version: 1.14.0
 URL: https://github.com/google/googletest
 Requires: gmock = 1.14.0
 Libs: -L${libdir} -lgmock_main 
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
+Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0

contrib/googletest-1.10.x/googletest/generated/gtest.pc

@@ -1,9 +1,9 @@
-libdir=/usr/local/lib
-includedir=/usr/local/include
+libdir=C:/Program Files (x86)/osre/lib
+includedir=C:/Program Files (x86)/osre/include
 
 Name: gtest
 Description: GoogleTest (without main() function)
 Version: 1.14.0
 URL: https://github.com/google/googletest
 Libs: -L${libdir} -lgtest 
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
+Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0

contrib/googletest-1.10.x/googletest/generated/gtest_main.pc

@@ -1,10 +1,10 @@
-libdir=/usr/local/lib
-includedir=/usr/local/include
+libdir=C:/Program Files (x86)/osre/lib
+includedir=C:/Program Files (x86)/osre/include
 
 Name: gtest_main
 Description: GoogleTest (with main() function)
 Version: 1.14.0
 URL: https://github.com/google/googletest
 Requires: gtest = 1.14.0
 Libs: -L${libdir} -lgtest_main 
-Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1
+Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=0

include/cppcore/CPPCoreCommon.h

@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <cstddef>
 #include <cassert>
+#include <cinttypes>
 #include <string.h>
 #include <stddef.h>
 #include <stdio.h>