diff --git a/mk/cmake/Modules/FindXercesC.cmake b/mk/cmake/Modules/FindXercesC.cmake index 2e0d704c..35bdb7a4 100644 --- a/mk/cmake/Modules/FindXercesC.cmake +++ b/mk/cmake/Modules/FindXercesC.cmake @@ -43,6 +43,7 @@ IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) # in cache already SET(XERCESC_FIND_QUIETLY TRUE) + #MESSAGE(STATUS "Found cached Xerces-C lib [${XERCESC_LIBRARY}]") ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY) OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON) @@ -62,7 +63,7 @@ ${XERCESC_INCLUDE_DIR} /usr/include ) -IF (XERCESC_STATIC) +IF (XERCESC_STATIC AND NOT XERCESC_LIBRARY) FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 libxerces-c.a libxerces-c_3.a libxerces-c2_8_0.a libxerces-c_2.a libXerces.a PATHS $ENV{XERCESC_LIBRARY_DIR} @@ -70,7 +71,9 @@ IF (XERCESC_STATIC) /usr/lib /usr/local/lib ) + IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) + MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") ADD_DEFINITIONS( -DXERCES_STATIC_LIBRARY ) IF(UNIX AND NOT APPLE) @@ -79,9 +82,7 @@ IF (XERCESC_STATIC) ENDIF() ENDIF() -IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) - -ELSE() +IF (NOT XERCESC_LIBRARY) FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_3 xerces-c xerces-c_3 xerces-c2_8_0 xerces-c_2 Xerces PATHS $ENV{XERCESC_LIBRARY_DIR} @@ -92,6 +93,10 @@ ELSE() $ENV{XERCESC_LIBRARY_DIR} ${XERCESC_LIBRARY_DIR} ) + + IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) + MESSAGE(STATUS "Found dynamic Xerces-C lib [${XERCESC_LIBRARY}]") + ENDIF() ENDIF() IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)