[ismrmrd] 135/177: Modified creation and installation of version.h. Improved XMLHDR versioning.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:02:11 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 bf1ae9e30f794657196c858ef6fc95035aa59e4a
Author: Souheil Inati <souheil.inati at nih.gov>
Date: Wed Oct 8 11:17:13 2014 -0400
Modified creation and installation of version.h. Improved XMLHDR versioning.
---
CMakeLists.txt | 17 +++++++++++++++--
include/ismrmrd/ismrmrd.h | 1 -
info/ismrmrd_version.in => include/version.in | 1 +
info/CMakeLists.txt | 18 ------------------
libsrc/ismrmrd.c | 7 ++++---
libsrc/xml.cpp | 3 ++-
utilities/CMakeLists.txt | 8 ++++++++
utilities/generate_cartesian_shepp_logan.cpp | 3 ++-
{info => utilities}/ismrmrd_info.cpp | 2 +-
9 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f9b89a..36ddac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,20 @@ endif()
set(ISMRMRD_VERSION_STRING ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})
+
+# Generate the version.h header file
+find_package(Git)
+if (GIT_FOUND)
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE ISMRMRD_GIT_SHA1)
+ string(STRIP ${ISMRMRD_GIT_SHA1} ISMRMRD_GIT_SHA1)
+else()
+ set(ISMRMRD_GIT_SHA1 "NA")
+endif()
+configure_file(include/version.in ${CMAKE_BINARY_DIR}/include/ismrmrd/version.h)
+install(FILES ${CMAKE_BINARY_DIR}/include/ismrmrd/version.h DESTINATION include/ismrmrd)
+# note: for the utilities in this project that need ismrmrd/version.h
+# remember to add ${CMAKE_BINARY_DIR}/include to the include path
+
# --- VERSIONING (end) ----
# --- Main Library (begin) ----
@@ -114,6 +128,7 @@ endif (WIN32)
# include directories for main library
set(ISMRMRD_TARGET_INCLUDE_DIRS
include
+ ${CMAKE_BINARY_DIR}/include
${HDF5_C_INCLUDE_DIR}
)
@@ -174,8 +189,6 @@ DESTINATION
share/ismrmrd/cmake
)
-add_subdirectory(info)
-
# --- Main Library (end) ----
# turn on testing
diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
index e9014eb..2bb5d09 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -85,7 +85,6 @@ extern "C" {
* Constants
*/
enum ISMRMRD_Constants {
- ISMRMRD_VERSION = 1,
ISMRMRD_USER_INTS = 8,
ISMRMRD_USER_FLOATS = 8,
ISMRMRD_PHYS_STAMPS = 3,
diff --git a/info/ismrmrd_version.in b/include/version.in
similarity index 84%
rename from info/ismrmrd_version.in
rename to include/version.in
index ce37a71..9cffb10 100644
--- a/info/ismrmrd_version.in
+++ b/include/version.in
@@ -4,6 +4,7 @@
#define ISMRMRD_VERSION_MAJOR @ISMRMRD_VERSION_MAJOR@
#define ISMRMRD_VERSION_MINOR @ISMRMRD_VERSION_MINOR@
#define ISMRMRD_VERSION_PATCH @ISMRMRD_VERSION_PATCH@
+#define ISMRMRD_XMLHDR_VERSION @ISMRMRD_VERSION_MINOR@
#define ISMRMRD_GIT_SHA1_HASH "@ISMRMRD_GIT_SHA1@"
#endif //ISMRMRD_VERSION_H
diff --git a/info/CMakeLists.txt b/info/CMakeLists.txt
deleted file mode 100644
index 222e370..0000000
--- a/info/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-message("Building info application")
-
-find_package(Git)
-if (GIT_FOUND)
- execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE ISMRMRD_GIT_SHA1)
- string(STRIP ${ISMRMRD_GIT_SHA1} ISMRMRD_GIT_SHA1)
-else()
- set(ISMRMRD_GIT_SHA1 "NA")
-endif()
-
-configure_file(ismrmrd_version.in ismrmrd_version.h)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-add_executable(ismrmrd_info ismrmrd_info.cpp)
-install(TARGETS ismrmrd_info DESTINATION bin)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd_version.h DESTINATION include)
-
diff --git a/libsrc/ismrmrd.c b/libsrc/ismrmrd.c
index 7feb8a7..6797fe6 100644
--- a/libsrc/ismrmrd.c
+++ b/libsrc/ismrmrd.c
@@ -14,6 +14,7 @@
#endif /* __cplusplus */
#include "ismrmrd/ismrmrd.h"
+#include "ismrmrd/version.h"
#ifdef __cplusplus
namespace ISMRMRD {
@@ -43,7 +44,7 @@ int ismrmrd_init_acquisition_header(ISMRMRD_AcquisitionHeader *hdr) {
}
memset(hdr, 0, sizeof(ISMRMRD_AcquisitionHeader));
- hdr->version = ISMRMRD_VERSION;
+ hdr->version = ISMRMRD_VERSION_MAJOR;
hdr->number_of_samples = 0;
hdr->available_channels = 1;
hdr->active_channels = 1;
@@ -184,7 +185,7 @@ int ismrmrd_init_image_header(ISMRMRD_ImageHeader *hdr) {
return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer should not NULL.");
}
memset(hdr, 0, sizeof(ISMRMRD_ImageHeader));
- hdr->version = ISMRMRD_VERSION;
+ hdr->version = ISMRMRD_VERSION_MAJOR;
hdr->matrix_size[0] = 0;
hdr->matrix_size[1] = 1;
hdr->matrix_size[2] = 1;
@@ -343,7 +344,7 @@ int ismrmrd_init_ndarray(ISMRMRD_NDArray *arr) {
return ISMRMRD_RUNTIMEERROR;
}
- arr->version = ISMRMRD_VERSION;
+ arr->version = ISMRMRD_VERSION_MAJOR;
arr->data_type = 0; /* no default data type */
arr->ndim = 0;
diff --git a/libsrc/xml.cpp b/libsrc/xml.cpp
index ac48d0a..c782c11 100644
--- a/libsrc/xml.cpp
+++ b/libsrc/xml.cpp
@@ -1,4 +1,5 @@
#include "ismrmrd/xml.h"
+#include "ismrmrd/version.h"
#include "pugixml.hpp"
#include <cstdlib>
@@ -520,7 +521,7 @@ namespace ISMRMRD
a.set_value("http://www.ismrm.org/ISMRMRD ismrmrd.xsd");
a = root.append_attribute("version");
- a.set_value("1"); // TODO how should this come from a definition in the header?
+ a.set_value(ISMRMRD_XMLHDR_VERSION);
if (h.version) {
append_optional_node(root,"version",h.version);
diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
index 0363ee4..5fcfff6 100644
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@@ -1,3 +1,11 @@
+# Build the info application
+message("Building info application")
+include_directories(${CMAKE_BINARY_DIR}/include
+ ${CMAKE_SOURCE_DIR}/include)
+add_executable(ismrmrd_info ismrmrd_info.cpp)
+target_link_libraries(ismrmrd_info ismrmrd)
+ install(TARGETS ismrmrd_info DESTINATION bin)
+
find_package(Boost COMPONENTS program_options)
find_package(FFTW3 COMPONENTS single)
diff --git a/utilities/generate_cartesian_shepp_logan.cpp b/utilities/generate_cartesian_shepp_logan.cpp
index ad4f5d3..de6d216 100644
--- a/utilities/generate_cartesian_shepp_logan.cpp
+++ b/utilities/generate_cartesian_shepp_logan.cpp
@@ -10,6 +10,7 @@
#include "ismrmrd/ismrmrd.h"
#include "ismrmrd/xml.h"
#include "ismrmrd/dataset.h"
+#include "ismrmrd/version.h"
#include "ismrmrd_phantom.h"
#include "ismrmrd_fftw.h"
@@ -151,7 +152,7 @@ int main(int argc, char** argv)
//Let's create a header, we will use the C++ classes in ismrmrd/xml.h
IsmrmrdHeader h;
- h.version = 1;
+ h.version = ISMRMRD_XMLHDR_VERSION;
h.experimentalConditions.H1resonanceFrequency_Hz = 63500000; //~1.5T
AcquisitionSystemInformation sys;
diff --git a/info/ismrmrd_info.cpp b/utilities/ismrmrd_info.cpp
similarity index 91%
rename from info/ismrmrd_info.cpp
rename to utilities/ismrmrd_info.cpp
index bf1d390..77a94ef 100644
--- a/info/ismrmrd_info.cpp
+++ b/utilities/ismrmrd_info.cpp
@@ -1,5 +1,5 @@
#include <iostream>
-#include "ismrmrd_version.h"
+#include "ismrmrd/version.h"
int main(int argc, char** argv)
{
--
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