snappy, revbump, fixes for cmake targets (#13504)

This commit is contained in:
Schrijvers Luc
2025-12-27 15:47:38 +01:00
committed by GitHub
parent 6d1918676b
commit eb0de34594
2 changed files with 42 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
From 5156915635dbd38192d7ac8771e2034ddbf9cd2b Mon Sep 17 00:00:00 2001
From 5c209306d11e0f996c9970e15a01c430031901bf Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Fri, 9 Jul 2021 16:57:35 +0200
Subject: Add a switch to use system gtest and benchmark
@@ -125,5 +125,44 @@ index cd71a47..0ce9cdc 100644
if(SNAPPY_FUZZING_BUILD)
--
2.51.0
2.52.0
From fdd687866b8a236c551ab0f99a3bc63c6fe190d7 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 27 Dec 2025 15:42:35 +0100
Subject: Set ${CMAKE_INSTALL_INCLUDEDIR} for cmake targets
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce9cdc..57d45d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,19 +271,19 @@ target_sources(snappy
"${PROJECT_BINARY_DIR}/config.h"
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h>
- $<INSTALL_INTERFACE:include/snappy-c.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/snappy-c.h>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h>
- $<INSTALL_INTERFACE:include/snappy-sinksource.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/snappy-sinksource.h>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy.h>
- $<INSTALL_INTERFACE:include/snappy.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/snappy.h>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
- $<INSTALL_INTERFACE:include/snappy-stubs-public.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/snappy-stubs-public.h>
)
target_include_directories(snappy
PUBLIC
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties(snappy
PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
--
2.52.0

View File

@@ -8,7 +8,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to \
HOMEPAGE="https://google.github.io/snappy/"
COPYRIGHT="2005-2017 Google Inc"
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc"
PATCHES="snappy-$portVersion.patchset"