[ismrmrd] 280/281: fix the errors after merging

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit ca42e3a2f61dfce929baea2d9abcc70450a2466f
Author: Hui Xue <hui.xue at nih.gov>
Date:   Fri Sep 5 17:29:00 2014 -0400

    fix the errors after merging
---
 CMakeLists.txt     | 12 ++++++++----
 xml/ismrmrd_meta.h |  6 ------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc552f3..5e91c42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,8 +130,14 @@ find_package(XercesC REQUIRED)
 set(XSDS ${ISMRMRD_SCHEMA_DIR}/ismrmrd.xsd)
 set(XSD_ARGS cxx-tree --generate-serialization)
 if ( WIN32 )
-    SET(XSD_ARGS cxx-tree --generate-serialization)
-    # --export-symbol EXPORTISMRMRDXSD --hxx-prologue-file ${CMAKE_SOURCE_DIR}/ismrmrd_xsd_export.h)
+    set(XSD_ARGS cxx-tree --generate-serialization)
+    WRAP_XSD(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
+    
+    # This dummy is required to trigger autogeneration of ${XSDS_SOURCES}
+    add_library(dummy SHARED ${XSDS_SOURCES})
+    target_link_libraries(dummy ${XERCESC_LIBRARIES})
+else (WIN32)
+    wrap_xsd(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
 endif (WIN32)
 
 if ( WIN32 )
@@ -139,8 +145,6 @@ if ( WIN32 )
         ${XERCESC_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${HDF5_CXX_INCLUDE_DIR}
         ${HDF5_C_INCLUDE_DIR})
     link_directories(${Boost_LIBRARY_DIRS})
-    add_library(dummy SHARED ${XSDS_SOURCES})
-    target_link_libraries(dummy ${XERCESC_LIBRARIES})
 endif ( WIN32 )
 
 if ( NOT WIN32 )
diff --git a/xml/ismrmrd_meta.h b/xml/ismrmrd_meta.h
index 4d4eeaf..5ca4433 100644
--- a/xml/ismrmrd_meta.h
+++ b/xml/ismrmrd_meta.h
@@ -247,12 +247,6 @@ namespace ISMRMRD
   template void MetaContainer::append<long>(const char* name, long value);
   template void MetaContainer::append<double>(const char* name, double);
   */
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> sf/development
 }
 
 #endif //ISMRMRDMETA_H

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git