From abd6f065ac38382c22862585db8bbb393ee5e8d3 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 17 May 2010 13:08:50 +0000 Subject: [PATCH] EED cvs conflict --- cmake/CREAMacro_FindAndUseLibraries.cmake | 27 +++++++---------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index bf30e50..990d988 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -320,28 +320,17 @@ IF(USE_XERCES) IF(NOT XERCES_LIB_DIR) MESSAGE(FATAL_ERROR "XERCES_DIR not found") ELSE(NOT XERCES_LIB_DIR) -<<<<<<< CREAMacro_FindAndUseLibraries.cmake - INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src ) - LINK_DIRECTORIES( ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug ) -======= - - INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include ) - LINK_DIRECTORIES( ${XERCES_LIB_DIR}/lib ) - ->>>>>>> 1.39 +##EED INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src ) +##EED LINK_DIRECTORIES( ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug ) + INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include ) + LINK_DIRECTORIES( ${XERCES_LIB_DIR}/lib ) ENDIF(NOT XERCES_LIB_DIR) IF(USE_DEBUG_LIB) -<<<<<<< CREAMacro_FindAndUseLibraries.cmake - set(XERCES_LIBRARIES ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D) -======= - set(XERCES_LIBRARIES xerces-c_3D) ->>>>>>> 1.39 +##EED set(XERCES_LIBRARIES ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D) + set(XERCES_LIBRARIES xerces-c_3D) ELSE(USE_DEBUG_LIB) -<<<<<<< CREAMacro_FindAndUseLibraries.cmake - set(XERCES_LIBRARIES ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3) -======= - set(XERCES_LIBRARIES xerces-c_3) ->>>>>>> 1.39 +#EED set(XERCES_LIBRARIES ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3) + set(XERCES_LIBRARIES xerces-c_3) ENDIF(USE_DEBUG_LIB) MARK_AS_ADVANCED(XERCES_LIB_DIR) ENDIF(WIN32) -- 2.45.1