[ismrmrd] 136/281: Changed the build procedure for the shepp logan phantom generator to link statically to the XSD files to avoid clashes with boost program options on Windows

[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 79ef28a3c2ef7012e96475ee797307d2f1496cee
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Wed Apr 10 22:06:39 2013 -0400

    Changed the build procedure for the shepp logan phantom generator to link statically to the XSD files to avoid clashes with boost program options on Windows
---
 utilities/CMakeLists.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
index d29b62c..5d6ff02 100644
--- a/utilities/CMakeLists.txt
+++ b/utilities/CMakeLists.txt
@@ -6,8 +6,15 @@ ADD_LIBRARY(ismrmrd_utilities SHARED ismrmrd_phantom.cpp)
 INSTALL(TARGETS ismrmrd_utilities DESTINATION lib)
 
 IF(FFTW3_FOUND)
+
+	#Process the XSD files
+	SET(XSDS ${CMAKE_CURRENT_SOURCE_DIR}/../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(${XSD_INCLUDES} ${XSD_INCLUDE_DIR} ${XERCESC_INCLUDE_DIR})
+
 	INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
-	ADD_EXECUTABLE(ismrmrd_generate_cartesian_shepp_logan generate_cartesian_shepp_logan.cpp)
-	TARGET_LINK_LIBRARIES(ismrmrd_generate_cartesian_shepp_logan ismrmrd_utilities ismrmrd ismrmrd_xsd ${FFTW3_LIBRARIES} ${Boost_LIBRARIES})
+	ADD_EXECUTABLE(ismrmrd_generate_cartesian_shepp_logan generate_cartesian_shepp_logan.cpp ${XSDS_SOURCES})
+	TARGET_LINK_LIBRARIES(ismrmrd_generate_cartesian_shepp_logan ismrmrd_utilities ismrmrd ${FFTW3_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES})
 	INSTALL(TARGETS ismrmrd_generate_cartesian_shepp_logan DESTINATION bin)
 ENDIF(FFTW3_FOUND)
\ No newline at end of file

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