Skip to content

Commit 8cf2933

Browse files
committed
Fix reporting of FieldML dependencies i.e. XML2 to parent scope.
Fix by hsor001. Needed to build zinc and cmgui on windows. https://tracker.physiomeproject.org/show_bug.cgi?id=3502
1 parent 63928dc commit 8cf2933

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ IF( ${FIELDML_NAMESPACE_NAME}_INSTALL_CONFIG )
124124
"\nGET_FILENAME_COMPONENT( ${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS \"\${SELF_DIR}/../../include\" ABSOLUTE )"
125125
"\nSET( ${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS \"\${${FIELDML_NAMESPACE_NAME}_INCLUDE_DIRS}\" \"${LIBXML2_INCLUDE_DIR}\" \"${HDF5_INCLUDE_DIRS}\" \"${MPI_INCLUDE_DIRS}\" )"
126126
"\nSET( ${FIELDML_NAMESPACE_NAME}_LIBRARIES ${FIELDML_API_LIBRARY_TARGET_NAME} ${FIELDML_IO_API_LIBRARY_TARGET_NAME} ${HDF5_MINE_LIBRARIES} ${MPI_MINE_LIBRARIES})"
127-
"\nSET( ${FIELDML_NAMESPACE_NAME}_DEFINITIONS )"
127+
"\nSET( ${FIELDML_NAMESPACE_NAME}_DEFINITIONS ${LIBXML2_DEFINITIONS} )"
128128
"\nSET( ${FIELDML_NAMESPACE_NAME}_FOUND TRUE )"
129129
"\nENDIF( NOT DEFINED _${FIELDML_NAMESPACE_NAME}_CONFIG_CMAKE )"
130130
"\n" )

core/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ ENDIF( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
9898
IF( WIN32 )
9999
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
100100
ENDIF( WIN32 )
101+
FOREACH( DEF ${LIBXML2_DEFINITIONS} )
102+
ADD_DEFINITIONS( -D${DEF} )
103+
ENDFOREACH( DEF ${LIBXML2_DEFINITIONS} )
104+
SET( LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} PARENT_SCOPE )
101105
SET(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
102106
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} )
103107

io/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ IF( FIELDML_USE_HDF5 )
9191
ENDIF( FIELDML_USE_HDF5 )
9292

9393
SET( CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX} )
94-
FIND_PACKAGE( LibXml2 REQUIRED )
9594

9695
SET( FIELDML_IO_API_SRCS
9796
src/ArrayDataReader.cpp

0 commit comments

Comments
 (0)