- Add Fix-finding-liborigin-header-in-project-import-test.patch to fix build with the latest liborigin OBS-URL: https://build.opensuse.org/request/show/1108473 OBS-URL: https://build.opensuse.org/package/show/science/labplot-kf5?expand=0&rev=38
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 94deef1dde74953aae53e69e61b0d9aaba6814d6 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
|
|
Date: Mon, 28 Aug 2023 00:24:42 +0200
|
|
Subject: [PATCH] Fix finding liborigin header in project import test
|
|
|
|
---
|
|
tests/import_export/Project/CMakeLists.txt | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/tests/import_export/Project/CMakeLists.txt b/tests/import_export/Project/CMakeLists.txt
|
|
index a812a91362..04be96c357 100644
|
|
--- a/tests/import_export/Project/CMakeLists.txt
|
|
+++ b/tests/import_export/Project/CMakeLists.txt
|
|
@@ -1,5 +1,13 @@
|
|
add_executable (ProjectImportTest ProjectImportTest.cpp)
|
|
|
|
+IF (ENABLE_LIBORIGIN)
|
|
+ IF (LIBORIGIN_FOUND)
|
|
+ # if system headers are missing: use the provided
|
|
+ target_include_directories( ProjectImportTest PRIVATE ${LIBORIGIN_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/liborigin" )
|
|
+ ELSE () # own version
|
|
+ target_include_directories( ProjectImportTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/liborigin" )
|
|
+ ENDIF()
|
|
+ENDIF ()
|
|
target_link_libraries(ProjectImportTest labplot2lib labplot2test)
|
|
|
|
add_test(NAME ProjectImportTest COMMAND ProjectImportTest)
|
|
--
|
|
GitLab
|
|
|