Commit 7b572ef8 authored by Andreas Tille's avatar Andreas Tille

Adapt patches

parent d59b1898
......@@ -6,13 +6,11 @@ Subject: Add support for multiarch.
CMakeLists.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b7589..b614f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,10 +198,12 @@ target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS})
@@ -202,10 +202,12 @@ target_link_libraries(ismrmrd ${ISMRMRD_
list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found
list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libaries
list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libraries
+include(GNUInstallDirs)
+
......@@ -25,7 +23,7 @@ index e6b7589..b614f71 100644
RUNTIME DESTINATION bin
COMPONENT Devel
)
@@ -257,7 +259,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
@@ -261,7 +263,7 @@ configure_file(cmake/ISMRMRDConfig.cmake
set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema)
set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
......@@ -34,7 +32,7 @@ index e6b7589..b614f71 100644
if (ISMRMRD_DATASET_SUPPORT)
list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS})
@@ -268,7 +270,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
@@ -272,7 +274,7 @@ configure_file(cmake/ISMRMRDConfig.cmake
@ONLY
)
......
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: Wed, 16 Nov 2016 10:29:41 +0000
Subject: Fix CMake package detection.
---
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..b9a30c4 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -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")
-
- find_package(Ismrmrd REQUIRED)
+ find_package(ISMRMRD REQUIRED)
# otherwise, building it as part of ISMRMRD itself
else()
......@@ -6,20 +6,9 @@ Subject: Fix HDF5 detection with CMake 3.6.
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 665e106..5e9b1a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,7 @@ find_package(HDF5 1.8 COMPONENTS C)
if (HDF5_FOUND)
set (ISMRMRD_DATASET_SUPPORT true)
set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
- set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
+ set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
else ()
set (ISMRMRD_DATASET_SUPPORT false)
@@ -146,7 +146,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
@@ -148,7 +148,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INS
if(DEFINED ENV{HDF5_ROOT})
set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
else ()
......
Disable-HTML-timestamps.patch
Use-explicit-64-bit-shifts-in-testsuite.patch
Fix-HDF5-detection-with-CMake-3.6.patch
Fix-CMake-package-configuration.patch
Fix-CMake-package-detection.patch
Add-support-for-multiarch.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