Revision: 12610
http://sourceforge.net/p/plplot/code/12610
Author: airwin
Date: 2013-10-20 00:47:03 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Eliminate -fvisibility=hidden option from CFLAGS for shapelib if the
user specifies it as an overall environment variable to be honored by
build_projects build. The reason this workaround is required is
shapelib currently has no visibility support for Linux.
Modified Paths:
--------------
trunk/cmake/build_projects/shapelib/bp.cmake
Modified: trunk/cmake/build_projects/shapelib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-20 00:14:09 UTC (rev 12609)
+++ trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-20 00:47:03 UTC (rev 12610)
@@ -47,11 +47,15 @@
endif(MSYS_PLATFORM)
#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+set(${BP_PACKAGE}_CFLAGS $ENV{CFLAGS})
+# Eliminate this option which is not allowed for shapelib
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS ${${BP_PACKAGE}_CFLAGS})
+
ExternalProject_Add(
build_${BP_PACKAGE}
URL ${${BP_PACKAGE}_URL}
URL_MD5 ${${BP_PACKAGE}_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${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}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
