no message

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index c317f0bf5e3225f98c683b2cefb542dfd54a0d2d..87224237fba58035fe82a43b44ce4cb4135a6acc 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -314,42 +314,53 @@ ENDIF(USE_BOOST)
 IF(USE_XERCES)
 
        # FIND xerces
-       IF(WIN32)
-       
+       IF(WIN32)       
                SET(XERCES_LIB_DIR $ENV{XERCES_DIR})
-                
                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
                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
                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
                ENDIF(USE_DEBUG_LIB)
-               
                MARK_AS_ADVANCED(XERCES_LIB_DIR)
        ENDIF(WIN32)
 
-
        IF(UNIX)
-               
-               SET(XERCES_LIBRARIES libxerces-c.so )
-                INCLUDE_DIRECTORIES( /usr/local/include )
-                LINK_DIRECTORIES(  /usr/local/lib ) 
-               #FIND_PACKAGE(Xerces)
-               # Use if found
-               #IF(Xerces_FOUND)
-                #  INCLUDE_DIRECTORIES( ${XERCES_INCLUDE_DIR} ) 
-               #ENDIF(Xerces_FOUND)            
-       ENDIF(UNIX)
-       
-       
+               IF(APPLE)
+                       SET(XERCES_LIBRARIES xerces-c )
+                        INCLUDE_DIRECTORIES( /opt/local/include )
+                        LINK_DIRECTORIES(  /opt/local/lib ) 
+               ELSEIF(APPLE)
+                       SET(XERCES_LIBRARIES libxerces-c.so )
+                        INCLUDE_DIRECTORIES( /usr/local/include )
+                        LINK_DIRECTORIES(  /usr/local/lib ) 
+                       #FIND_PACKAGE(Xerces)
+                       # Use if found
+                       #IF(Xerces_FOUND)
+                        #  INCLUDE_DIRECTORIES( ${XERCES_INCLUDE_DIR} ) 
+                       #ENDIF(Xerces_FOUND)            
+               ENDIF(APPLE)
+       ENDIF(UNIX)     
   
 ENDIF(USE_XERCES)