EED cvs conflict

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index bf30e504256ec6f955a6e400cff0ae5ee8308d36..990d9882adfa95d3bf793dfa424494a7564dbb72 100644 (file)
--- 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)