From 1fe3c31dde7a94ac7250ee8208ea1ecadc0077de Mon Sep 17 00:00:00 2001 From: Markus Prettner Date: Thu, 17 Oct 2024 09:37:21 +0200 Subject: [PATCH] Remove googletest package Signed-off-by: Markus Prettner --- package-system/.gitignore | 1 - .../googletest/Findgoogletest.cmake.template | 100 ----------- .../FindgoogletestRelOnly.cmake.template | 80 --------- package-system/googletest/build_config.json | 155 ------------------ .../googletest/googletest-release-1.8.1.patch | 108 ------------ package_build_list_host_darwin.json | 4 - package_build_list_host_linux-aarch64.json | 2 - package_build_list_host_linux.json | 2 - package_build_list_host_windows.json | 4 - 9 files changed, 456 deletions(-) delete mode 100644 package-system/googletest/Findgoogletest.cmake.template delete mode 100644 package-system/googletest/FindgoogletestRelOnly.cmake.template delete mode 100644 package-system/googletest/build_config.json delete mode 100644 package-system/googletest/googletest-release-1.8.1.patch diff --git a/package-system/.gitignore b/package-system/.gitignore index 88217023..7d50d320 100644 --- a/package-system/.gitignore +++ b/package-system/.gitignore @@ -8,7 +8,6 @@ Blast-* Crashpad-* DirectXShaderCompilerDxc-* googlebenchmark-* -googletest-* ISPCTexComp-* libpng-* libsamplerate-* diff --git a/package-system/googletest/Findgoogletest.cmake.template b/package-system/googletest/Findgoogletest.cmake.template deleted file mode 100644 index 63855214..00000000 --- a/package-system/googletest/Findgoogletest.cmake.template +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -# this file actually ingests the library and defines targets. - -# Googletest -set(GOOGLETEST_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/googletest/include) -set(GOOGLETEST_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/googletest/lib) - -set(GOOGLETEST_COMPILE_DEFINITIONS -${CUSTOM_ADDITIONAL_COMPILE_DEFINITIONS}) - -set(GOOGLETEST_LINK_OPTIONS -${CUSTOM_ADDITIONAL_LINK_OPTIONS}) - -# GTest -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GTest") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GTEST_LIBS_DEBUG $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtestd$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GTEST_LIBS_RELEASE $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtest$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GTEST_LIBRARY - "$$<$$:$${GOOGLETEST_GTEST_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GTEST_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GTEST_LIBS_DEBUG}>") - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GTEST_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GTEST_FOUND True) -endif() - -# GTestMain -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GTestMain") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GTESTMAIN_LIBS_DEBUG $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtest_maind$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GTESTMAIN_LIBS_RELEASE $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GTESTMAIN_LIBRARY - "$$<$$:$${GOOGLETEST_GTESTMAIN_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GTESTMAIN_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GTESTMAIN_LIBS_DEBUG}>") - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GTESTMAIN_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GTESTMAIN_FOUND True) -endif() - -# GMock -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GMock") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GMOCK_LIBS_DEBUG $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmockd$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GMOCK_LIBS_RELEASE $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmock$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GMOCK_LIBRARY - "$$<$$:$${GOOGLETEST_GMOCK_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GMOCK_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GMOCK_LIBS_DEBUG}>") - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GMOCK_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GMOCK_FOUND True) -endif() - - -# GMockMain -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GMockMain") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GMOCKMAIN_LIBS_DEBUG $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmock_maind$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GMOCKMAIN_LIBS_RELEASE $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main$${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(GOOGLETEST_GMOCKMAIN_LIBRARY - "$$<$$:$${GOOGLETEST_GMOCKMAIN_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GMOCKMAIN_LIBS_RELEASE}>" - "$$<$$:$${GOOGLETEST_GMOCKMAIN_LIBS_DEBUG}>") - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GMOCKMAIN_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GMOCKMAIN_FOUND True) -endif() diff --git a/package-system/googletest/FindgoogletestRelOnly.cmake.template b/package-system/googletest/FindgoogletestRelOnly.cmake.template deleted file mode 100644 index 421272c0..00000000 --- a/package-system/googletest/FindgoogletestRelOnly.cmake.template +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -# this file actually ingests the library and defines targets. - -# Googletest -set(GOOGLETEST_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/googletest/include) -set(GOOGLETEST_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/googletest/lib) - -set(GOOGLETEST_COMPILE_DEFINITIONS -${CUSTOM_ADDITIONAL_COMPILE_DEFINITIONS}) - -set(GOOGLETEST_LINK_OPTIONS -${CUSTOM_ADDITIONAL_LINK_OPTIONS}) - -# GTest -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GTest") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GTEST_LIBRARY $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtest$${CMAKE_STATIC_LIBRARY_SUFFIX}) - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GTEST_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GTEST_FOUND True) -endif() - -# GTestMain -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GTestMain") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GTESTMAIN_LIBRARY $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main$${CMAKE_STATIC_LIBRARY_SUFFIX}) - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GTESTMAIN_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GTESTMAIN_FOUND True) -endif() - -# GMock -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GMock") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GMOCK_LIBRARY $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmock$${CMAKE_STATIC_LIBRARY_SUFFIX}) - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GMOCK_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GMOCK_FOUND True) -endif() - - -# GMockMain -################################################################# -set(TARGET_WITH_NAMESPACE "3rdParty::googletest::GMockMain") -if (NOT TARGET $${TARGET_WITH_NAMESPACE}) - - set(GOOGLETEST_GMOCKMAIN_LIBRARY $${GOOGLETEST_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main$${CMAKE_STATIC_LIBRARY_SUFFIX}) - - add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) - ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_INCLUDE_DIR}) - target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_GMOCKMAIN_LIBRARY}) - target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_LINK_OPTIONS}) - target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${GOOGLETEST_COMPILE_DEFINITIONS}) - set(GOOGLETEST_GMOCKMAIN_FOUND True) -endif() diff --git a/package-system/googletest/build_config.json b/package-system/googletest/build_config.json deleted file mode 100644 index 92e5620d..00000000 --- a/package-system/googletest/build_config.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "git_url":"https://github.com/google/googletest.git", - "git_tag":"release-1.8.1", - "package_name":"googletest", - "package_version":"1.8.1-rev4", - "package_url":"https://github.com/google/googletest", - "package_license":"BSD-3-Clause", - "package_license_file":"LICENSE", - "cmake_find_template":"Findgoogletest.cmake.template", - "cmake_find_target":"Findgoogletest.cmake", - "Platforms":{ - "Windows":{ - "Windows":{ - "cmake_generate_args":[ - "-G", - "\"Visual Studio 15 Win64\"", - "-DCMAKE_CXX_FLAGS=/Zc:__cplusplus", - "-Dgtest_force_shared_crt=ON" - ], - "cmake_build_args":[ - "-j" - ], - "custom_additional_compile_definitions":[ - - ], - "custom_additional_link_options":[ - "$<$:-Wl,>/ignore:4099" - ], - "custom_additional_libraries":[ - - ] - }, - "Android":{ - "cmake_generate_args_debug":[ - "-G", - "Ninja", - "-DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake", - "-DANDROID_ABI=arm64-v8a", - "-DCMAKE_CXX_FLAGS=\"-fPIC\"", - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_BUILD_TYPE=Debug" - ], - "cmake_generate_args_release":[ - "-G", - "Ninja", - "-DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake", - "-DANDROID_ABI=arm64-v8a", - "-DCMAKE_CXX_FLAGS=\"-fPIC\"", - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_BUILD_TYPE=Release" - ], - "custom_additional_compile_definitions":[ - "GTEST_HAS_TR1_TUPLE=0", - "GTEST_OS_SUPPORTS_DEATH_TEST=0" - ], - "custom_additional_link_options":[ - - ], - "custom_additional_libraries":[ - - ] - } - }, - "Darwin":{ - "Mac":{ - "build_configs":[ - "Release" - ], - "cmake_find_template":"FindgoogletestRelOnly.cmake.template", - "cmake_generate_args":[ - "-G", - "Xcode", - "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12", - "-DCMAKE_OSX_ARCHITECTURES=x86_64", - "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"", - "-DCMAKE_CXX_STANDARD=17" - ], - "cmake_build_args":[ - "-j", - "8" - ], - "custom_additional_compile_definitions":[ - - ], - "custom_additional_link_options":[ - - ], - "custom_additional_libraries":[ - - ] - }, - "iOS":{ - "custom_cmake_install":true, - "cmake_generate_args":[ - "-G", - "Xcode", - "-DCMAKE_SYSTEM_NAME=iOS", - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_OSX_ARCHITECTURES=arm64", - "-DCMAKE_THREAD_LIBS_INIT=-pthread", - "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"" - ], - "cmake_build_args":[ - - ], - "custom_additional_compile_definitions":[ - "GTEST_HAS_TR1_TUPLE=0", - "GTEST_OS_SUPPORTS_DEATH_TEST=0" - ], - "custom_additional_link_options":[ - - ], - "custom_additional_libraries":[ - - ] - } - }, - "Linux":{ - "Linux":{ - "cmake_generate_args_debug":[ - "-G", - "Unix\\ Makefiles", - "-DCMAKE_C_COMPILER=clang-6.0", - "-DCMAKE_CXX_COMPILER=clang++-6.0", - "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"", - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_BUILD_TYPE=Debug" - ], - "cmake_generate_args_release":[ - "-G", - "Unix\\ Makefiles", - "-DCMAKE_C_COMPILER=clang-6.0", - "-DCMAKE_CXX_COMPILER=clang++-6.0", - "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"", - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_BUILD_TYPE=Release" - ], - "cmake_build_args":[ - "-j" - ], - "custom_additional_compile_definitions":[ - "GTEST_HAS_TR1_TUPLE=0", - "GTEST_OS_SUPPORTS_DEATH_TEST=0" - ], - "custom_additional_link_options":[ - - ], - "custom_additional_libraries":[ - - ] - }, - "Linux-aarch64": "@Linux" - } - } -} diff --git a/package-system/googletest/googletest-release-1.8.1.patch b/package-system/googletest/googletest-release-1.8.1.patch deleted file mode 100644 index f24e07dd..00000000 --- a/package-system/googletest/googletest-release-1.8.1.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -ru googletest-release-1.8.1-orig/googletest/include/gtest/internal/custom/gtest-port.h googletest-release-1.8.1/googletest/include/gtest/internal/custom/gtest-port.h ---- googletest-release-1.8.1-orig/googletest/include/gtest/internal/custom/gtest-port.h 2018-08-31 10:21:58.000000000 -0500 -+++ googletest-release-1.8.1/googletest/include/gtest/internal/custom/gtest-port.h 2019-08-28 18:10:03.329550600 -0500 -@@ -34,4 +34,32 @@ - #ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ - #define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ - -+#if !defined(GTEST_HAS_LOCALTIME_S) -+#define GTEST_HAS_LOCALTIME_S 0 -+#endif -+ -+#if !defined(GTEST_HAS_IS_ATTY) -+#define GTEST_HAS_IS_ATTY 1 -+#endif -+ -+#if !defined(GTEST_HAS_CHDIR) -+#define GTEST_HAS_CHDIR 1 -+#endif -+ -+#if !defined(GTEST_HAS_GETENV) -+#define GTEST_HAS_GETENV 1 -+#endif -+ -+#if !defined(GTEST_OS_SUPPORTS_DEATH_TEST) -+#define GTEST_OS_SUPPORTS_DEATH_TEST 1 -+#endif -+ -+#if !defined(GTEST_HAS_GETCWD) -+#define GTEST_HAS_GETCWD 1 -+#endif -+ -+#if !defined(GTEST_STUB_GETCWD_PATH) -+#define GTEST_STUB_GETCWD_PATH "" -+#endif -+ - #endif // GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_ -diff -ru googletest-release-1.8.1-orig/googletest/include/gtest/internal/gtest-port.h googletest-release-1.8.1/googletest/include/gtest/internal/gtest-port.h ---- googletest-release-1.8.1-orig/googletest/include/gtest/internal/gtest-port.h 2018-08-31 10:21:58.000000000 -0500 -+++ googletest-release-1.8.1/googletest/include/gtest/internal/gtest-port.h 2019-08-30 06:27:22.575984300 -0500 -@@ -829,7 +829,7 @@ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \ -- GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) -+ GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) && (GTEST_OS_SUPPORTS_DEATH_TEST) - # define GTEST_HAS_DEATH_TEST 1 - #endif - -@@ -2485,7 +2485,11 @@ - typedef struct stat StatStruct; - - inline int FileNo(FILE* file) { return fileno(file); } -+#if !GTEST_HAS_IS_ATTY -+inline int IsATTY(int fd) { return 0; } -+#else - inline int IsATTY(int fd) { return isatty(fd); } -+#endif - inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); } - inline int StrCaseCmp(const char* s1, const char* s2) { - return strcasecmp(s1, s2); -@@ -2508,7 +2512,7 @@ - // StrError() aren't needed on Windows CE at this time and thus not - // defined there. - --#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT -+#if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && GTEST_HAS_CHDIR - inline int ChDir(const char* dir) { return chdir(dir); } - #endif - inline FILE* FOpen(const char* path, const char* mode) { -@@ -2532,7 +2536,7 @@ - inline const char* StrError(int errnum) { return strerror(errnum); } - #endif - inline const char* GetEnv(const char* name) { --#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT -+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || !GTEST_HAS_GETENV - // We are on Windows CE, which has no environment variables. - static_cast(name); // To prevent 'unused argument' warning. - return NULL; -diff -ru googletest-release-1.8.1-orig/googletest/src/gtest.cc googletest-release-1.8.1/googletest/src/gtest.cc ---- googletest-release-1.8.1-orig/googletest/src/gtest.cc 2018-08-31 10:21:58.000000000 -0500 -+++ googletest-release-1.8.1/googletest/src/gtest.cc 2019-08-28 17:12:06.397466300 -0500 -@@ -3628,6 +3628,8 @@ - return false; - *out = *tm_ptr; - return true; -+#elif GTEST_HAS_LOCALTIME_S -+ return localtime_s(&seconds, out) != nullptr; - #else - return localtime_r(&seconds, out) != NULL; - #endif -diff -ru googletest-release-1.8.1-orig/googletest/src/gtest-filepath.cc googletest-release-1.8.1/googletest/src/gtest-filepath.cc ---- googletest-release-1.8.1-orig/googletest/src/gtest-filepath.cc 2018-08-31 10:21:58.000000000 -0500 -+++ googletest-release-1.8.1/googletest/src/gtest-filepath.cc 2021-01-04 14:53:54.173667600 -0600 -@@ -104,7 +104,14 @@ - return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd); - #else - char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; -+#if GTEST_HAS_GETCWD - char* result = getcwd(cwd, sizeof(cwd)); -+#else -+ #define GTEST_STRINGIFY_WRAP(name) GTEST_STRINGIFY_(name) -+ const char* result = GTEST_STRINGIFY_WRAP(GTEST_STUB_GETCWD_PATH); -+ #undef GTEST_STRINGIFY_WRAP -+ strncpy(cwd, result, sizeof(cwd) - 1); -+#endif - # if GTEST_OS_NACL - // getcwd will likely fail in NaCl due to the sandbox, so return something - // reasonable. The user may have provided a shim implementation for getcwd, diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 3d90d0a9..3ec9ae89 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -14,8 +14,6 @@ "freetype-2.11.1-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system/freetype/temp --clean", "googlebenchmark-1.7.0-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name iOS --package-root ../../package-system --clean", "googlebenchmark-1.7.0-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Mac --package-root ../../package-system --clean", - "googletest-1.8.1-rev4-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name iOS --package-root ../../package-system --clean", - "googletest-1.8.1-rev4-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Mac --package-root ../../package-system --clean", "ISPCTexComp-36b80aa-rev1-mac": "package-system/ISPCTexComp/build_package_image.py", "png-1.6.37-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Mac --package-root ../../package-system/libpng/temp --clean", "png-1.6.37-rev3-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name iOS --package-root ../../package-system/libpng/temp --clean", @@ -65,8 +63,6 @@ "freetype-2.11.1-rev1-ios": "package-system/freetype/temp/freetype-ios", "googlebenchmark-1.7.0-rev1-ios": "package-system/googlebenchmark-ios", "googlebenchmark-1.7.0-rev1-mac": "package-system/googlebenchmark-mac", - "googletest-1.8.1-rev4-ios": "package-system/googletest-ios", - "googletest-1.8.1-rev4-mac": "package-system/googletest-mac", "ISPCTexComp-36b80aa-rev1-mac": "package-system/ISPCTexComp-mac", "png-1.6.37-rev2-mac": "package-system/libpng/temp/png-mac", "png-1.6.37-rev3-ios": "package-system/libpng/temp/png-ios", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 8041f529..e3cbb374 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -15,7 +15,6 @@ "expat-2.4.2-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux-aarch64 --clean", "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean", "googlebenchmark-1.7.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean", - "googletest-1.8.1-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux-aarch64 --clean", "ISPCTexComp-36b80aa-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/ISPCTexComp --platform-name Linux-aarch64 --clean", "libsamplerate-0.2.1-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Linux-aarch64 --clean", "Lua-5.4.4-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux-aarch64 --clean", @@ -56,7 +55,6 @@ "expat-2.4.2-rev2-linux-aarch64": "package-system/expat/temp/expat-linux-aarch64", "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64", "googlebenchmark-1.7.0-rev1-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64", - "googletest-1.8.1-rev4-linux-aarch64": "package-system/googletest/temp/googletest-linux-aarch64", "ISPCTexComp-36b80aa-rev2-linux-aarch64": "package-system/ISPCTexComp/temp/ISPCTexComp-linux-aarch64", "libsamplerate-0.2.1-rev2-linux-aarch64": "package-system/libsamplerate/temp/libsamplerate-linux-aarch64", "Lua-5.4.4-rev1-linux-aarch64": "package-system/Lua/temp/Lua-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 4d369a72..dcdd76c3 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -15,7 +15,6 @@ "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean", "freetype-2.11.1-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system/freetype/temp --clean", "googlebenchmark-1.7.0-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean", - "googletest-1.8.1-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux --package-root ../../package-system --clean", "ISPCTexComp-36b80aa-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/ISPCTexComp --platform-name Linux --clean", "png-1.6.37-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux --package-root ../../package-system/libpng/temp --clean", "libsamplerate-0.2.1-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Linux --package-root ../../package-system --clean", @@ -64,7 +63,6 @@ "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux", "freetype-2.11.1-rev1-linux": "package-system/freetype/temp/freetype-linux", "googlebenchmark-1.7.0-rev1-linux": "package-system/googlebenchmark-linux", - "googletest-1.8.1-rev4-linux": "package-system/googletest-linux", "ISPCTexComp-36b80aa-rev2-linux": "package-system/ISPCTexComp/temp/ISPCTexComp-linux", "png-1.6.37-rev2-linux": "package-system/libpng/temp/png-linux", "libsamplerate-0.2.1-rev2-linux": "package-system/libsamplerate-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index c25e5478..10526eb8 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -20,8 +20,6 @@ "freetype-2.11.1-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system/freetype/temp --clean", "googlebenchmark-1.7.0-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Android --package-root ../../package-system --clean", "googlebenchmark-1.7.0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Windows --package-root ../../package-system --clean", - "googletest-1.8.1-rev4-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Android --package-root ../../package-system --clean", - "googletest-1.8.1-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Windows --package-root ../../package-system --clean", "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp/build_package_image.py", "libsamplerate-0.2.1-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Android --package-root ../../package-system --custom-toolchain-file ../../Scripts/cmake/Platform/Android/Toolchain_android.cmake --clean", "libsamplerate-0.2.1-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Windows --package-root ../../package-system --clean", @@ -86,8 +84,6 @@ "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform", "googlebenchmark-1.7.0-rev2-android": "package-system/googlebenchmark-android", "googlebenchmark-1.7.0-rev1-windows": "package-system/googlebenchmark-windows", - "googletest-1.8.1-rev4-android": "package-system/googletest-android", - "googletest-1.8.1-rev4-windows": "package-system/googletest-windows", "hdf5-1.0.11-rev2-multiplatform": "package-system/hdf5-multiplatform", "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp-windows", "libsamplerate-0.2.1-rev2-android": "package-system/libsamplerate-android",