[Plplot-cvs] SF.net SVN: plplot:[12759] trunk/cmake/build_projects/shapelib

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

Revision: 12759
          http://sourceforge.net/p/plplot/code/12759
Author:   airwin
Date:     2013-11-27 06:28:01 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
I have already implemented an "error message delivery hook" method to
quiet shapelib "Unable to open" error messages directly from the
src/plmap.c PLplot code.  This makes the brute-force build
modification that was used previously to quiet those error messages
completely redundant so therefore drop this brute-force method.

Modified Paths:
--------------
    trunk/cmake/build_projects/shapelib/CMakeLists.txt
    trunk/cmake/build_projects/shapelib/README
    trunk/cmake/build_projects/shapelib/bp.cmake

Removed Paths:
-------------
    trunk/cmake/build_projects/shapelib/shapelib.patch

Modified: trunk/cmake/build_projects/shapelib/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/shapelib/CMakeLists.txt	2013-11-27 06:09:46 UTC (rev 12758)
+++ trunk/cmake/build_projects/shapelib/CMakeLists.txt	2013-11-27 06:28:01 UTC (rev 12759)
@@ -83,15 +83,6 @@
   shptree.c
   )
 
-option(SHP_DROP_UNABLE_TO_OPEN_MSG "Drop \"unable to open\" error messages" ON)
-if(SHP_DROP_UNABLE_TO_OPEN_MSG)
-  #define the SHP_DROP_UNABLE_TO_OPEN_MSG C macro for this source file.
-  set_source_files_properties(shpopen.c
-    PROPERTIES
-    COMPILE_DEFINITIONS SHP_DROP_UNABLE_TO_OPEN_MSG
-    )
-endif(SHP_DROP_UNABLE_TO_OPEN_MSG)
-
 add_library(shp ${lib_SRC})
 
 if(WIN32 AND NOT CYGWIN)

Modified: trunk/cmake/build_projects/shapelib/README
===================================================================
--- trunk/cmake/build_projects/shapelib/README	2013-11-27 06:09:46 UTC (rev 12758)
+++ trunk/cmake/build_projects/shapelib/README	2013-11-27 06:28:01 UTC (rev 12759)
@@ -17,16 +17,10 @@
 (3) Copy the CMakeLists.txt file into the top-level of the unpacked
 shapelib-1.3.0 source tree.
 
-(4) Apply shapelib.patch (which optionally quiets error messages when
-shapelib is unable to open shapefiles).  First change directory
-to the top-level of the shapelib-1.3.0 source tree, then
-
-patch -p1 < <full path to shapelib.patch>
-
-(5) Create a separate empty build tree and use it to configure, build,
+(4) Create a separate empty build tree and use it to configure, build,
 install and test shapelib.  For example (you will need to tailor the
-compiler, compile options, install prefix, eg_data location, and source tree location to your own
-needs):
+compiler, compile options, install prefix, eg_data location, and
+source tree location to your own needs):
 
 mkdir build_dir
 cd build_dir

Modified: trunk/cmake/build_projects/shapelib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/bp.cmake	2013-11-27 06:09:46 UTC (rev 12758)
+++ trunk/cmake/build_projects/shapelib/bp.cmake	2013-11-27 06:28:01 UTC (rev 12759)
@@ -55,8 +55,7 @@
   build_${BP_PACKAGE}
   URL ${${BP_PACKAGE}_URL}
   URL_MD5 ${${BP_PACKAGE}_URL_MD5}
-  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/${BP_PACKAGE}.patch
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=${${BP_PACKAGE}_CFLAGS} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data ${EP_BASE}/Source/build_${BP_PACKAGE}
+    CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=${${BP_PACKAGE}_CFLAGS} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data ${EP_BASE}/Source/build_${BP_PACKAGE}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
   TEST_BEFORE_INSTALL ON
   TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_CTEST_COMMAND}

Deleted: trunk/cmake/build_projects/shapelib/shapelib.patch
===================================================================
--- trunk/cmake/build_projects/shapelib/shapelib.patch	2013-11-27 06:09:46 UTC (rev 12758)
+++ trunk/cmake/build_projects/shapelib/shapelib.patch	2013-11-27 06:28:01 UTC (rev 12759)
@@ -1,23 +0,0 @@
-diff -Naur '--exclude=CMakeLists.txt' '--exclude=*~' shapelib-1.3.0_pristine/shpopen.c shapelib-1.3.0/shpopen.c
---- shapelib-1.3.0_pristine/shpopen.c	2012-01-24 14:33:01.000000000 -0800
-+++ shapelib-1.3.0/shpopen.c	2013-11-26 11:46:43.215221421 -0800
-@@ -559,7 +559,9 @@
-         char *pszMessage = (char *) malloc(strlen(pszBasename)*2+256);
-         sprintf( pszMessage, "Unable to open %s.shp or %s.SHP.", 
-                   pszBasename, pszBasename );
-+#ifndef SHP_DROP_UNABLE_TO_OPEN_MSG
-         psHooks->Error( pszMessage );
-+#endif
-         free( pszMessage );
- 
-         free( psSHP );
-@@ -582,7 +584,9 @@
-         char *pszMessage = (char *) malloc(strlen(pszBasename)*2+256);
-         sprintf( pszMessage, "Unable to open %s.shx or %s.SHX.", 
-                   pszBasename, pszBasename );
-+#ifndef SHP_DROP_UNABLE_TO_OPEN_MSG
-         psHooks->Error( pszMessage );
-+#endif
-         free( pszMessage );
- 
-         psSHP->sHooks.FClose( psSHP->fpSHP );

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