Fix usability of ISMRMRD CMake packaging.

- New patch Fix-CMake-package-configuration.patch.
- New patch Fix-CMake-package-detection.patch.
- Drop Use-Debian-CMake-find-module-location.patch, no longer required.
- Install CMake configuration to -dev package.

Gbp-Dch: full
parent 0990a623
usr/include/ismrmrd
usr/lib/*.so
usr/share/ismrmrd/cmake/FindIsmrmrd.cmake usr/lib/cmake/ismrmrd/
usr/lib/cmake
From: Ghislain Antony Vaillant <ghisvail@gmail.com>
Date: Fri, 11 Nov 2016 12:36:34 +0000
Subject: Fix CMake package configuration.
---
CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e9b1a9..e6b7589 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,6 +258,11 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema)
set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib)
+if (ISMRMRD_DATASET_SUPPORT)
+ list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
+ list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS})
+ list(APPEND ISMRMRD_LIBRARIES ${HDF5_LIBRARIES})
+endif ()
configure_file(cmake/ISMRMRDConfig.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake"
@ONLY
From: Ghislain Antony Vaillant <ghisvail@gmail.com>
Date: Sat, 5 Mar 2016 16:18:09 +0000
Subject: Use Debian CMake find module location.
Date: Wed, 16 Nov 2016 10:29:41 +0000
Subject: Fix CMake package detection.
---
examples/c/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
examples/c/CMakeLists.txt | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
index 778ab5a..a4d8136 100644
index 778ab5a..b9a30c4 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -7,7 +7,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message(FATAL_ERROR "ISMRMRD_HOME environment variable must be defined")
endif()
@@ -3,13 +3,7 @@ project(ISMRMRD-C-EXAMPLE)
# if building this example as a standalone project
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- if(NOT DEFINED ENV{ISMRMRD_HOME})
- message(FATAL_ERROR "ISMRMRD_HOME environment variable must be defined")
- endif()
-
- list(APPEND CMAKE_MODULE_PATH "$ENV{ISMRMRD_HOME}/share/ismrmrd/cmake")
+ list(APPEND CMAKE_MODULE_PATH "$ENV{ISMRMRD_HOME}/lib/cmake/ismrmrd")
find_package(Ismrmrd REQUIRED)
-
- find_package(Ismrmrd REQUIRED)
+ find_package(ISMRMRD REQUIRED)
# otherwise, building it as part of ISMRMRD itself
else()
Disable-HTML-timestamps.patch
Use-explicit-64-bit-shifts-in-testsuite.patch
Use-Debian-CMake-find-module-location.patch
Fix-HDF5-detection-with-CMake-3.6.patch
Fix-CMake-package-configuration.patch
Fix-CMake-package-detection.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment