summaryrefslogtreecommitdiff
path: root/devel/apitrace/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apitrace/files')
-rw-r--r--devel/apitrace/files/patch-CMakeLists.txt4
-rw-r--r--devel/apitrace/files/patch-lib_trace_CMakeLists.txt12
-rw-r--r--devel/apitrace/files/patch-thirdparty_CMakeLists.txt26
3 files changed, 27 insertions, 15 deletions
diff --git a/devel/apitrace/files/patch-CMakeLists.txt b/devel/apitrace/files/patch-CMakeLists.txt
index f4ecc1842560..2ab689caf661 100644
--- a/devel/apitrace/files/patch-CMakeLists.txt
+++ b/devel/apitrace/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2024-05-30 18:10:10 UTC
+--- CMakeLists.txt.orig 2025-06-26 12:43:44 UTC
+++ CMakeLists.txt
-@@ -411,6 +411,10 @@ endif ()
+@@ -421,6 +421,10 @@ endif ()
elseif (ENABLE_STATIC_EXE)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
endif ()
diff --git a/devel/apitrace/files/patch-lib_trace_CMakeLists.txt b/devel/apitrace/files/patch-lib_trace_CMakeLists.txt
index 9e61019d6f69..a9cc6dc9ccbd 100644
--- a/devel/apitrace/files/patch-lib_trace_CMakeLists.txt
+++ b/devel/apitrace/files/patch-lib_trace_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/trace/CMakeLists.txt.orig 2024-05-30 18:10:10 UTC
+--- lib/trace/CMakeLists.txt.orig 2025-06-26 12:43:44 UTC
+++ lib/trace/CMakeLists.txt
-@@ -27,6 +27,8 @@ add_convenience_library (common
+@@ -27,13 +27,15 @@ add_convenience_library (common
trace_ostream_zlib.cpp
)
@@ -9,3 +9,11 @@
target_link_libraries (common
guids
highlight
+ os
+- Snappy::snappy
+ ZLIB::ZLIB
+ PkgConfig::BROTLIDEC
++ ${Snappy_LIBRARIES}
+ )
+
+ if (BUILD_TESTING)
diff --git a/devel/apitrace/files/patch-thirdparty_CMakeLists.txt b/devel/apitrace/files/patch-thirdparty_CMakeLists.txt
index 982275526b6c..e470b7dc1a18 100644
--- a/devel/apitrace/files/patch-thirdparty_CMakeLists.txt
+++ b/devel/apitrace/files/patch-thirdparty_CMakeLists.txt
@@ -1,6 +1,6 @@
---- thirdparty/CMakeLists.txt.orig 2024-05-30 18:10:10 UTC
+--- thirdparty/CMakeLists.txt.orig 2025-06-26 12:43:44 UTC
+++ thirdparty/CMakeLists.txt
-@@ -16,54 +16,69 @@ endfunction ()
+@@ -16,56 +16,70 @@ endfunction ()
include (${ARGV})
endfunction ()
@@ -84,15 +84,21 @@
+# include_with_scope (libbacktrace.cmake)
+#endif ()
- # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
--if (NOT GTEST_FOUND)
-- message (STATUS "Using bundled GTest")
-- include_with_scope (gtest.cmake)
+-if (BUILD_TESTING)
+- # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
+- if (NOT GTEST_FOUND)
+- message (STATUS "Using bundled GTest")
+- include_with_scope (gtest.cmake)
+- endif ()
-endif ()
-+#if (NOT GTEST_FOUND)
-+# message (STATUS "Using bundled GTest")
-+# include_with_scope (gtest.cmake)
++#if (BUILD_TESTING)
++# # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt
++# if (NOT GTEST_FOUND)
++# message (STATUS "Using bundled GTest")
++# include_with_scope (gtest.cmake)
++# endif ()
+#endif ()
++
+find_path(Snappy_INCLUDE_DIR NAMES snappy.h
+ PATHS ${Snappy_ROOT_DIR} ${Snappy_ROOT_DIR}/include /usr/local/include)
+
@@ -105,8 +111,6 @@
+if(SNAPPY_FOUND)
+ message(STATUS "Found Snappy (include: ${Snappy_INCLUDE_DIR}, library: ${Snappy_LIBRARIES})")
+ mark_as_advanced(Snappy_INCLUDE_DIR Snappy_LIBRARIES)
-+ find_package(Snappy REQUIRED)
-+ target_link_libraries(Snappy::snappy)
+endif()
if (MSVC)