[Plplot-cvs] SF.net SVN: plplot:[13026] trunk/cmake/modules/FindShapelib.cmake

[<ai...@us...>]

Revision: 13026
          http://sourceforge.net/p/plplot/code/13026
Author:   airwin
Date:     2014-02-26 01:14:43 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
Update shapelib find module to remove additional find paths (which are
normally not required and which can add trouble on certain platforms)
and to look for both "shp" and "shapelib" for the name of the library.
(Thanks to Phil Rosenberg for the latter suggestion.)

Modified Paths:
--------------
    trunk/cmake/modules/FindShapelib.cmake

Modified: trunk/cmake/modules/FindShapelib.cmake
===================================================================
--- trunk/cmake/modules/FindShapelib.cmake	2014-02-26 00:38:44 UTC (rev 13025)
+++ trunk/cmake/modules/FindShapelib.cmake	2014-02-26 01:14:43 UTC (rev 13026)
@@ -8,12 +8,11 @@
 #  library.
 #  SHAPELIB_LIBRARY_DIRS, the directory where the shapelib library is found.
 
-find_path(SHAPELIB_INCLUDE_DIR shapefil.h /usr/local/include /usr/include)
+find_path(SHAPELIB_INCLUDE_DIR shapefil.h)
 
 if(SHAPELIB_INCLUDE_DIR)
   find_library(SHAPELIB_LIBRARY
-  NAMES shp
-  PATHS /usr/local/lib /usr/lib
+  NAMES shp shapelib
   )
   if(SHAPELIB_LIBRARY)
     # Set uncached variables as per standard.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.