[ismrmrd] 270/281: bug fixed: ismrmrd.cxx and ismrmrd.h get generated in xsd folder

[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 d49b948d7a15a57c21da203663dec9ef47f568fe
Author: Dusan Puletic <puletic at users.sourceforge.net>
Date:   Mon Aug 25 11:02:35 2014 -0400

    bug fixed: ismrmrd.cxx and ismrmrd.h get generated in xsd folder
---
 CMakeLists.txt     | 5 ++++-
 xml/ismrmrd_meta.h | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b5fec1..fb92c53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,8 @@ 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)
+    # --export-symbol EXPORTISMRMRDXSD --hxx-prologue-file ${CMAKE_SOURCE_DIR}/ismrmrd_xsd_export.h)
 endif (WIN32)
 
 wrap_xsd(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
@@ -95,6 +96,8 @@ 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 3fd5fd8..e023f84 100644
--- a/xml/ismrmrd_meta.h
+++ b/xml/ismrmrd_meta.h
@@ -149,6 +149,11 @@ namespace ISMRMRD
     }
   };
 
+  class MetaContainer;
+
+  EXPORTISMRMRDXML void deserialize(const char* xml, MetaContainer& h);
+  EXPORTISMRMRDXML void serialize(MetaContainer& h, std::ostream& o);
+
   class MetaContainer
   {
     typedef std::map< std::string, std::vector<MetaValue> > map_t;
@@ -240,8 +245,7 @@ namespace ISMRMRD
   template void MetaContainer::append<double>(const char* name, double);
   */
 
-  EXPORTISMRMRDXML void deserialize(const char* xml, MetaContainer& h);
-  EXPORTISMRMRDXML void serialize(MetaContainer& h, std::ostream& o);
+
 
 }
 

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