File 0001-Fix-install-path-for-evergreen-headers.patch of Package openms

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-install-path-for-evergreen-headers.patch of Package openms

From f2ced768ed33ed0f54f6b60198e34f40da7f6bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 24 Aug 2022 02:41:38 +0200
Subject: [PATCH] Fix install path for evergreen headers

Also exclude demos from installation.

Fixes #6314, #6315
---
 src/openms/thirdparty/evergreen/src/CMakeLists.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/openms/thirdparty/evergreen/src/CMakeLists.txt b/src/openms/thirdparty/evergreen/src/CMakeLists.txt
index 52bc2f8..afd6453 100644
--- a/src/openms/thirdparty/evergreen/src/CMakeLists.txt
+++ b/src/openms/thirdparty/evergreen/src/CMakeLists.txt
@@ -39,7 +39,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 add_library(Evergreen INTERFACE)
 target_include_directories(Evergreen SYSTEM INTERFACE 
                             "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
-                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}/thirdparty/evergreen/src>")
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}/OpenMS/evergreen>")
 
 # Export it under OpenMSTargets.cmake instead of a separate EvergreenTargets file
 #install(EXPORT EvergreenTargets DESTINATION lib/cmake/evergreen)
@@ -48,11 +48,13 @@ target_include_directories(Evergreen SYSTEM INTERFACE
 install_library(Evergreen)
 openms_register_export_target(Evergreen)
 
-get_filename_component(EVERGREEN_HEADERS "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(EVERGREEN_HEADERS "${EVERGREEN_HEADERS}" PATH)
+get_filename_component(EVERGREEN_HEADERS "${CMAKE_CURRENT_LIST_DIR}" PATH)
 
 # Install headers
-install_directory(${EVERGREEN_HEADERS} ${INSTALL_INCLUDE_DIR}/thirdparty thirdparty_headers)
-
-
+install(DIRECTORY ${EVERGREEN_HEADERS}
+        DESTINATION ${INSTALL_INCLUDE_DIR}/OpenMS/evergreen
+        COMPONENT thirdparty_headers
+        PATTERN demos EXCLUDE
+        PATTERN CMakeLists.txt EXCLUDE
+)
 
-- 
2.37.1

Places

File 0001-Fix-install-path-for-evergreen-headers.patch of Package openms

Places