From 666ab7d918c768af8a139f5b02c42bb596cb2fd7 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 28 Jul 2010 22:01:07 +0000 Subject: [PATCH] [CMAKE] - We do have oldnames lib now. - Add proper psdk dependency for libxml2. svn path=/branches/cmake-bringup/; revision=48336 --- lib/3rdparty/libxml2/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/3rdparty/libxml2/CMakeLists.txt b/lib/3rdparty/libxml2/CMakeLists.txt index 7321294ef6d..39d1a28fb1a 100644 --- a/lib/3rdparty/libxml2/CMakeLists.txt +++ b/lib/3rdparty/libxml2/CMakeLists.txt @@ -3,8 +3,6 @@ include_directories(./include) add_definitions(-D__MINGW32__ -DLIBXML_STATIC -D_REENTRANT -DHAVE_WIN32_THREADS -D_MBCS -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H) add_definitions(-D_DLL -D__USE_CRTIMP) -# FIXME: workarounds until we have a proper oldnames library -add_definitions(-Dgetcwd=_getcwd -Dclose=_close -Dwrite=_write -Dread=_read -Dopen=_open) file(GLOB_RECURSE SOURCE "*.c") LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/runsuite.c) @@ -35,3 +33,5 @@ LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/triostr.c) LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/xmlint.c) add_library(libxml2 ${SOURCE}) +target_link_libraries(libxml2 oldnames) +add_dependencies(libxml2 psdk) \ No newline at end of file