[Plplot-cvs] SF.net SVN: plplot:[12788] trunk/cmake/epa_build/wxwidgets/bp.cmake

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

Revision: 12788
          http://sourceforge.net/p/plplot/code/12788
Author:   airwin
Date:     2013-12-01 07:19:12 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
Drop -fvisibility=hidden option from both CFLAGS and CXXFLAGS.  This
solved a build issue where I happened to have those flags enabled.

Tested by Alan W. Irwin <ai...@us...> on Linux using
build_wxwidgets target for epa_build project.

Modified Paths:
--------------
    trunk/cmake/epa_build/wxwidgets/bp.cmake

Modified: trunk/cmake/epa_build/wxwidgets/bp.cmake
===================================================================
--- trunk/cmake/epa_build/wxwidgets/bp.cmake	2013-12-01 02:04:10 UTC (rev 12787)
+++ trunk/cmake/epa_build/wxwidgets/bp.cmake	2013-12-01 07:19:12 UTC (rev 12788)
@@ -47,18 +47,24 @@
   # memory with MinGW.  See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601
   # for discussion of this.  Apparently the issue was fixed for
   # MinGW-4.6, but it appears to be back for 4.7.2.
-  set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=-fno-keep-inline-dllexport")
+  set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
 else(MSYS_PLATFORM)
   set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
-  set(${BP_PACKAGE}_SET_CXXFLAGS)
+  set(${BP_PACKAGE}_SET_CXXFLAGS "CXXFLAGS=$ENV{CXXFLAGS}")
 endif(MSYS_PLATFORM)
 #message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
 
+set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+
+# Drop -fvisibility=hidden since that option does not work for this package.
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CFLAGS "${${BP_PACKAGE}_SET_CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_SET_CXXFLAGS "${${BP_PACKAGE}_SET_CXXFLAGS}")
+
 ExternalProject_Add(
   build_${BP_PACKAGE}
   URL ${${BP_PACKAGE}_URL}
   URL_MD5 ${${BP_PACKAGE}_URL_MD5}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
   )

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