From 523a0171ce7a376ac251cfc0146cd420ba8f40ba Mon Sep 17 00:00:00 2001 From: Daniel Savchenko <dsavchenko@delors.informatik.rwth-aachen.de> Date: Tue, 17 Dec 2024 13:38:03 +0100 Subject: [PATCH] updated gtest version and fixed Mac Codesigning Issue --- cmake/fixbundle.cmake.in | 6 ++++++ libs_required/ACG/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/fixbundle.cmake.in b/cmake/fixbundle.cmake.in index 73698d92..cb4da4d1 100644 --- a/cmake/fixbundle.cmake.in +++ b/cmake/fixbundle.cmake.in @@ -58,3 +58,9 @@ fixup_bundle (@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app "${_plug # create qt plugin configuration file file(WRITE "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins") +# Sign all Libraries (needed for Code Signing) +execute_process(COMMAND find "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Resources/QtPlugins/" -type f -name "*.dylib" -exec codesign --force --sign - --timestamp=none {} \;) +execute_process(COMMAND find "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Libraries/" -type f -name "*.dylib" -exec codesign --force --sign - --timestamp=none {} \;) + +# Sign all Frameworks (Also needed for Code Signing) +execute_process(COMMAND find "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Frameworks/" -type d -name "*.framework" -exec codesign --force --sign - --timestamp=none {} \;) diff --git a/libs_required/ACG/CMakeLists.txt b/libs_required/ACG/CMakeLists.txt index 66ad4778..5055dbf0 100644 --- a/libs_required/ACG/CMakeLists.txt +++ b/libs_required/ACG/CMakeLists.txt @@ -379,7 +379,7 @@ include(FetchContent) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # v1.14.0 + GIT_TAG b514bdc898e2951020cbdca1304b75f5950d1f59 # v1.15.2 ) if(WIN32) # avoid linking errors, cf https://stackoverflow.com/questions/12540970/how-to-make-gtest-build-mdd-instead-of-mtd-by-default-using-cmake -- GitLab