[ismrmrd] 56/177: Reorganized library layout for standardizing install and header naming ismrmrd/meta.h, etc..
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:02:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.
commit 0078f92c95fa232b4ceaf7261423cbc04a4e3c55
Author: Souheil Inati <souheil.inati at nih.gov>
Date: Wed Sep 17 13:14:20 2014 -0400
Reorganized library layout for standardizing install and header naming ismrmrd/meta.h,etc..
---
CMakeLists.txt | 61 +++++++-------------------
cmake/FindIsmrmrd.cmake | 8 ++--
ismrmrd_dataset.h => include/ismrmrd/dataset.h | 0
ismrmrd_export.h => include/ismrmrd/export.h | 0
ismrmrd.h => include/ismrmrd/ismrmrd.h | 0
xml/ismrmrd_meta.h => include/ismrmrd/meta.h | 2 +-
xml/ismrmrd_xml.h => include/ismrmrd/xml.h | 3 +-
ismrmrd_dataset.c => libsrc/dataset.c | 2 +-
ismrmrd_dataset.cpp => libsrc/dataset.cpp | 2 +-
ismrmrd.c => libsrc/ismrmrd.c | 2 +-
ismrmrd.cpp => libsrc/ismrmrd.cpp | 2 +-
xml/ismrmrd_meta.cpp => libsrc/meta.cpp | 2 +-
{xml => libsrc}/pugiconfig.hpp | 0
{xml => libsrc}/pugixml.cpp | 0
{xml => libsrc}/pugixml.hpp | 0
xml/ismrmrd_xml.cpp => libsrc/xml.cpp | 2 +-
{xml => libsrc/xml}/.gitignore | 0
17 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f7b5fc..3d349dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,26 +11,6 @@ IF(NOT CMAKE_BUILD_TYPE)
FORCE)
ENDIF(NOT CMAKE_BUILD_TYPE)
-# define install paths globally
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(ISMRMRD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/ismrmrd" CACHE PATH
- "Using default installation path" FORCE)
-else(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(ISMRMRD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-set(ISMRMRD_INSTALL_LIB_DIR "${ISMRMRD_INSTALL_PREFIX}/lib")
-set(ISMRMRD_INSTALL_INCLUDE_DIR "${ISMRMRD_INSTALL_PREFIX}/include")
-set(ISMRMRD_INSTALL_BIN_DIR "${ISMRMRD_INSTALL_PREFIX}/bin")
-set(ISMRMRD_INSTALL_MODULE_DIR "${ISMRMRD_INSTALL_PREFIX}/cmake")
-set(ISMRMRD_INSTALL_SCHEMA_DIR "${ISMRMRD_INSTALL_PREFIX}/schema")
-set(ISMRMRD_INSTALL_MATLAB_DIR "${ISMRMRD_INSTALL_PREFIX}/matlab")
-set(ISMRMRD_INSTALL_JAVA_DIR "${ISMRMRD_INSTALL_PREFIX}/java")
-set(ISMRMRD_INSTALL_PYTHON_DIR "${ISMRMRD_INSTALL_PREFIX}/python")
-set(ISMRMRD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(ISMRMRD_MODULE_SOURCE_DIR "${ISMRMRD_SOURCE_DIR}/cmake")
-set(ISMRMRD_SCHEMA_SOURCE_DIR "${ISMRMRD_SOURCE_DIR}/schema")
-set(ISMRMRD_XML_SOURCE_DIR "${ISMRMRD_SOURCE_DIR}/xml")
-
# compiler flags
if (WIN32)
add_definitions(-DWIN32 -D_WIN32 -D_WINDOWS)
@@ -105,20 +85,19 @@ find_package(HDF5 1.8 COMPONENTS C REQUIRED)
# include directories for main library
include_directories(
- ${ISMRMRD_SOURCE_DIR}
- ${ISMRMRD_XML_SOURCE_DIR}
+ include
${HDF5_C_INCLUDE_DIR}
)
# main library
add_library(ismrmrd SHARED
- ${ISMRMRD_SOURCE_DIR}/ismrmrd.c
- ${ISMRMRD_SOURCE_DIR}/ismrmrd.cpp
- ${ISMRMRD_SOURCE_DIR}/ismrmrd_dataset.c
- ${ISMRMRD_SOURCE_DIR}/ismrmrd_dataset.cpp
- ${ISMRMRD_XML_SOURCE_DIR}/ismrmrd_xml.cpp
- ${ISMRMRD_XML_SOURCE_DIR}/ismrmrd_meta.cpp
- ${ISMRMRD_XML_SOURCE_DIR}/pugixml.cpp
+ libsrc/ismrmrd.c
+ libsrc/ismrmrd.cpp
+ libsrc/dataset.c
+ libsrc/dataset.cpp
+ libsrc/xml.cpp
+ libsrc/meta.cpp
+ libsrc/pugixml.cpp
)
set_target_properties(ismrmrd PROPERTIES
VERSION ${ISMRMRD_VERSION_STRING}
@@ -127,30 +106,22 @@ set_target_properties(ismrmrd PROPERTIES
target_link_libraries(ismrmrd ${HDF5_LIBRARIES})
# install the main library
-install(TARGETS ismrmrd DESTINATION ${ISMRMRD_INSTALL_LIB_DIR})
+install(TARGETS ismrmrd DESTINATION lib)
# install the headers
-install(FILES
- ${ISMRMRD_SOURCE_DIR}/ismrmrd.h
- ${ISMRMRD_SOURCE_DIR}/ismrmrd_dataset.h
- ${ISMRMRD_XML_SOURCE_DIR}/ismrmrd_xml.h
- ${ISMRMRD_XML_SOURCE_DIR}/ismrmrd_meta.h
- ${ISMRMRD_SOURCE_DIR}/ismrmrd_export.h
-DESTINATION
- ${ISMRMRD_INSTALL_INCLUDE_DIR}
-)
+install(DIRECTORY include/ismrmrd DESTINATION include)
# install the schema file
-install(FILES ${ISMRMRD_SCHEMA_SOURCE_DIR}/ismrmrd.xsd
- DESTINATION ${ISMRMRD_INSTALL_SCHEMA_DIR})
+install(FILES schema/ismrmrd.xsd
+ DESTINATION share/ismrmrd/schema)
# install the cmake modules
install(FILES
- ${ISMRMRD_MODULE_SOURCE_DIR}/FindIsmrmrd.cmake
- ${ISMRMRD_MODULE_SOURCE_DIR}/FindFFTW3.cmake
- ${ISMRMRD_MODULE_SOURCE_DIR}/FindNumPy.cmake
+ cmake/FindIsmrmrd.cmake
+ cmake/FindFFTW3.cmake
+ cmake/FindNumPy.cmake
DESTINATION
- ${ISMRMRD_INSTALL_MODULE_DIR}
+ share/ismrmrd/cmake
)
# --- Main Library (end) ----
diff --git a/cmake/FindIsmrmrd.cmake b/cmake/FindIsmrmrd.cmake
index 649fbaf..a438e66 100644
--- a/cmake/FindIsmrmrd.cmake
+++ b/cmake/FindIsmrmrd.cmake
@@ -4,15 +4,15 @@
# ISMRMRD_LIBRARIES - libismrmrd.so and libismrmrd_xml.so
# ISMRMRD_SCHEMA_DIR - where to find ismrmrd.xsd
-FIND_PATH( ISMRMRD_INCLUDE_DIR ismrmrd.h
-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES include ismrmrd ismrmrd/include)
+FIND_PATH( ISMRMRD_INCLUDE_DIR ismrmrd/ismrmrd.h
+HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES include)
FIND_PATH( ISMRMRD_SCHEMA_DIR ismrmrd.xsd
-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES share/ismrmrd/schema)
FIND_LIBRARY( ISMRMRD_LIBRARY
NAMES ismrmrd
- PATHS /usr/local/lib ${ISMRMRD_INCLUDE_DIR}/../lib /usr/lib )
+ PATHS ${ISMRMRD_INCLUDE_DIR}/../../lib /usr/local/lib /usr/lib )
SET(ISMRMRD_LIBRARIES ${ISMRMRD_LIBRARY})
diff --git a/ismrmrd_dataset.h b/include/ismrmrd/dataset.h
similarity index 100%
rename from ismrmrd_dataset.h
rename to include/ismrmrd/dataset.h
diff --git a/ismrmrd_export.h b/include/ismrmrd/export.h
similarity index 100%
rename from ismrmrd_export.h
rename to include/ismrmrd/export.h
diff --git a/ismrmrd.h b/include/ismrmrd/ismrmrd.h
similarity index 100%
rename from ismrmrd.h
rename to include/ismrmrd/ismrmrd.h
diff --git a/xml/ismrmrd_meta.h b/include/ismrmrd/meta.h
similarity index 99%
rename from xml/ismrmrd_meta.h
rename to include/ismrmrd/meta.h
index 71d6199..9b99b52 100644
--- a/xml/ismrmrd_meta.h
+++ b/include/ismrmrd/meta.h
@@ -1,7 +1,7 @@
#ifndef ISMRMRDMETA_H
#define ISMRMRDMETA_H
-#include "ismrmrd_export.h"
+#include "ismrmrd/export.h"
#include <string>
#include <sstream>
diff --git a/xml/ismrmrd_xml.h b/include/ismrmrd/xml.h
similarity index 99%
rename from xml/ismrmrd_xml.h
rename to include/ismrmrd/xml.h
index eb88900..337d5cb 100644
--- a/xml/ismrmrd_xml.h
+++ b/include/ismrmrd/xml.h
@@ -1,8 +1,7 @@
#ifndef ISMRMRDXML_H
#define ISMRMRDXML_H
-#include "ismrmrd_export.h"
-
+#include "ismrmrd/export.h"
#include <cstddef>
#include <new> //For std::badalloc
diff --git a/ismrmrd_dataset.c b/libsrc/dataset.c
similarity index 99%
rename from ismrmrd_dataset.c
rename to libsrc/dataset.c
index 13154b6..106c83c 100644
--- a/ismrmrd_dataset.c
+++ b/libsrc/dataset.c
@@ -11,7 +11,7 @@
#endif /* __cplusplus */
#include <hdf5.h>
-#include "ismrmrd_dataset.h"
+#include "ismrmrd/dataset.h"
#ifdef __cplusplus
namespace ISMRMRD {
diff --git a/ismrmrd_dataset.cpp b/libsrc/dataset.cpp
similarity index 99%
rename from ismrmrd_dataset.cpp
rename to libsrc/dataset.cpp
index e8797b4..85320b8 100644
--- a/ismrmrd_dataset.cpp
+++ b/libsrc/dataset.cpp
@@ -1,4 +1,4 @@
-#include "ismrmrd_dataset.h"
+#include "ismrmrd/dataset.h"
// for memcpy and free in older compilers
#include <string.h>
diff --git a/ismrmrd.c b/libsrc/ismrmrd.c
similarity index 99%
rename from ismrmrd.c
rename to libsrc/ismrmrd.c
index 61e11bf..c4bca2b 100644
--- a/ismrmrd.c
+++ b/libsrc/ismrmrd.c
@@ -21,7 +21,7 @@
#endif /* __cplusplus */
-#include "ismrmrd.h"
+#include "ismrmrd/ismrmrd.h"
#ifdef __cplusplus
namespace ISMRMRD {
diff --git a/ismrmrd.cpp b/libsrc/ismrmrd.cpp
similarity index 99%
rename from ismrmrd.cpp
rename to libsrc/ismrmrd.cpp
index 8fa7359..45ef16c 100644
--- a/ismrmrd.cpp
+++ b/libsrc/ismrmrd.cpp
@@ -1,7 +1,7 @@
#include <string.h>
#include <stdlib.h>
-#include "ismrmrd.h"
+#include "ismrmrd/ismrmrd.h"
namespace ISMRMRD {
diff --git a/xml/ismrmrd_meta.cpp b/libsrc/meta.cpp
similarity index 98%
rename from xml/ismrmrd_meta.cpp
rename to libsrc/meta.cpp
index 56603fd..b22ef97 100644
--- a/xml/ismrmrd_meta.cpp
+++ b/libsrc/meta.cpp
@@ -1,4 +1,4 @@
-#include "ismrmrd_meta.h"
+#include "ismrmrd/meta.h"
#include "pugixml.hpp"
diff --git a/xml/pugiconfig.hpp b/libsrc/pugiconfig.hpp
similarity index 100%
rename from xml/pugiconfig.hpp
rename to libsrc/pugiconfig.hpp
diff --git a/xml/pugixml.cpp b/libsrc/pugixml.cpp
similarity index 100%
rename from xml/pugixml.cpp
rename to libsrc/pugixml.cpp
diff --git a/xml/pugixml.hpp b/libsrc/pugixml.hpp
similarity index 100%
rename from xml/pugixml.hpp
rename to libsrc/pugixml.hpp
diff --git a/xml/ismrmrd_xml.cpp b/libsrc/xml.cpp
similarity index 99%
rename from xml/ismrmrd_xml.cpp
rename to libsrc/xml.cpp
index e419b93..05cc400 100644
--- a/xml/ismrmrd_xml.cpp
+++ b/libsrc/xml.cpp
@@ -1,4 +1,4 @@
-#include "ismrmrd_xml.h"
+#include "ismrmrd/xml.h"
#include "pugixml.hpp"
#include <cstdlib>
diff --git a/xml/.gitignore b/libsrc/xml/.gitignore
similarity index 100%
rename from xml/.gitignore
rename to libsrc/xml/.gitignore
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list