[ismrmrd] 269/281: fix windows xsd warp

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:01:23 UTC 2015


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 16c47a47ef265363841577f9d454125acf3c524c
Author: Hui Xue <hui.xue at nih.gov>
Date:   Sun Aug 24 09:27:04 2014 -0400

    fix windows xsd warp
---
 CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f02a1da..d1b1801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,20 +85,12 @@ 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(XSDS schema/ismrmrd.xsd)
     set(XSD_ARGS cxx-tree --generate-serialization)
     WRAP_XSD(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
-    include_directories(${ISMRMRD_SCHEMA_SOURCE_DIR} ${XSD_INCLUDE_DIR}
-        ${XERCESC_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${HDF5_CXX_INCLUDE_DIR}
-        ${HDF5_C_INCLUDE_DIR})
-    link_directories(${Boost_LIBRARY_DIRS})
     
     # 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)

-- 
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