[Greater-commits] r183 - trunk/Administration/cmake

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-09 18:22:25 +0200 (Thu, 09 Jun 2011)
New Revision: 183

Modified:
   trunk/Administration/cmake/FindXercesC.cmake
Log:
Fix for version 2.8 windows precompiled binaries name


Modified: trunk/Administration/cmake/FindXercesC.cmake
===================================================================
--- trunk/Administration/cmake/FindXercesC.cmake	2011-06-09 15:40:28 UTC (rev 182)
+++ trunk/Administration/cmake/FindXercesC.cmake	2011-06-09 16:22:25 UTC (rev 183)
@@ -29,14 +29,14 @@
 )
 
 IF (XERCESC_STATIC)
-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.1 xerces-c
+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.1 xerces-c xerces-c_static_2
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
  /usr/lib
  /usr/local/lib
 )
-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.1D
+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.1D xerces-c_static_2D
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
@@ -45,15 +45,19 @@
 )
 ADD_DEFINITIONS( -DXERCES_STATIC_LIBRARY )
 ELSE (XERCESC_STATIC)
-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_3
+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_3 xerces-c_2 xerces-c_2_8
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
+ /usr/lib
+ /usr/local/lib
 )
-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_3D
+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_3D xerces-c_2D xerces-c_2_8D
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
+ /usr/lib
+ /usr/local/lib
 )
 ENDIF (XERCESC_STATIC)