From: <dg...@su...> - 2009-01-11 00:10:05
|
Author: ianmartin Date: Sun Jan 11 01:09:25 2009 New Revision: 5085 URL: http://www.opensync.org/changeset/5085 Log: Added missing libxml2 requirements in CMake files Modified: format-plugins/xmlformat/trunk/CMakeLists.txt format-plugins/xmlformat/trunk/src/CMakeLists.txt Modified: format-plugins/xmlformat/trunk/CMakeLists.txt ============================================================================== --- format-plugins/xmlformat/trunk/CMakeLists.txt Sun Jan 11 00:40:36 2009 (r5084) +++ format-plugins/xmlformat/trunk/CMakeLists.txt Sun Jan 11 01:09:25 2009 (r5085) @@ -9,6 +9,7 @@ SET( OPENSYNC_MIN_VERSION "0.39" ) FIND_PACKAGE( OpenSync REQUIRED ) FIND_PACKAGE( GLIB2 REQUIRED ) +FIND_PACKAGE( LibXml2 REQUIRED ) FIND_PACKAGE( Check ) INCLUDE( OpenSyncInternal ) Modified: format-plugins/xmlformat/trunk/src/CMakeLists.txt ============================================================================== --- format-plugins/xmlformat/trunk/src/CMakeLists.txt Sun Jan 11 00:40:36 2009 (r5084) +++ format-plugins/xmlformat/trunk/src/CMakeLists.txt Sun Jan 11 01:09:25 2009 (r5085) @@ -1,11 +1,11 @@ -LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ) -INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ) +LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ) +INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ) OPENSYNC_FORMAT_ADD( xmlformat xmlformat.c xmlformat_compare.c xmlformat_merge.c ) OPENSYNC_FORMAT_ADD( xmlformat-doc xmlformat-doc.c ) -TARGET_LINK_LIBRARIES( xmlformat ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ) -TARGET_LINK_LIBRARIES( xmlformat ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ) +TARGET_LINK_LIBRARIES( xmlformat ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ) +TARGET_LINK_LIBRARIES( xmlformat-doc ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ) # Required for UNITTESTING only ADD_LIBRARY( xmlformat-static STATIC xmlformat_compare.c xmlformat.c xmlformat_merge.c ) |