Mirror/FairLogger
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairLogger.git synced 2025-10-15 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 1.5.0-1

Browse Source
This commit is contained in:
Dennis Klein
2019-08-09 20:44:10 +02:00
parent 9949e83a14
commit 54e0ac2a83
12 changed files with 166 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
debian/patches/0001-CMake-Do-not-bake-git-version-into-installed-files.patch vendored Normal file
View File

@@ -0,0 +1,35 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:16:06 +0200
Subject: CMake: Do not bake git version into installed files
---
CMakeLists.txt | 2 +-
cmake/FairLoggerLib.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 673e2ac..159cda3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ target_include_directories(FairLogger
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties(FairLogger PROPERTIES
- VERSION ${PROJECT_GIT_VERSION}
+ VERSION ${PROJECT_VERSION}
SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
)
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index b038058..ca4f52f 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -215,7 +215,7 @@ endfunction()
macro(install_cmake_package)
include(CMakePackageConfigHelpers)
set(PACKAGE_INSTALL_DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
+ ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
)
install(EXPORT ${PROJECT_EXPORT_SET}
NAMESPACE ${PROJECT_NAME}::

26
debian/patches/0002-CMake-Disable-relative-install-RPATH.patch vendored Normal file
View File

@@ -0,0 +1,26 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:18:31 +0200
Subject: CMake: Disable relative install RPATH
---
cmake/FairLoggerLib.cmake | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index ca4f52f..d15d163 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -131,11 +131,9 @@ macro(set_fairlogger_defaults)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-new-dtags")
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--enable-new-dtags")
- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
- else()
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
endif()
endif()

21
debian/patches/0003-CMake-Workaround-broken-pristine-tar.patch vendored Normal file
View File

@@ -0,0 +1,21 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:24:46 +0200
Subject: CMake: Workaround broken pristine tar
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 159cda3..7a457cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ cmake_policy(VERSION 3.9...3.14)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(FairLoggerLib)
-get_git_version()
+get_git_version(DEFAULT_VERSION 1.5.0)
project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")

3
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,3 @@
0001-CMake-Do-not-bake-git-version-into-installed-files.patch
0002-CMake-Disable-relative-install-RPATH.patch
0003-CMake-Workaround-broken-pristine-tar.patch