[Plplot-cvs] SF.net SVN: plplot:[13078] trunk/cmake/epa_build

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

Revision: 13078
          http://sourceforge.net/p/plplot/code/13078
Author:   airwin
Date:     2014-03-16 23:09:57 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Add gtk+ dependency to wxwidgets for the Unix case and also add
wxwidgets as a "starting" package for the top-level CMakeLists.txt
file so a build of wxwidgets will always be possible regardless of
whether plplot depends on it or not.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt
    trunk/cmake/epa_build/wxwidgets/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2014-03-16 22:22:46 UTC (rev 13077)
+++ trunk/cmake/epa_build/CMakeLists.txt	2014-03-16 23:09:57 UTC (rev 13078)
@@ -416,6 +416,7 @@
     plplot
     plplot_lite
     gtk+
+    wxwidgets
     qt4_lite
     )
 endif(BUILD_THE_BUILDTOOLS)

Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2014-03-16 22:22:46 UTC (rev 13077)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2014-03-16 23:09:57 UTC (rev 13078)
@@ -39,6 +39,7 @@
 
 if(MSYS_PLATFORM)
   set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
+  # No further dependencies required on Windows.
 else(MSYS_PLATFORM)
   set(CXXFLAGS "$ENV{CXXFLAGS}")
   # To avoid having to build all of gtk with epa_build in a consistent
@@ -51,8 +52,9 @@
   # that is provided by the default gtk toolkit and needed by the
   # PLplot build of the wxwidgets device.
   # The inevitable conclusion is that on Unix, we must use the gtk toolkit
-  # and therefore epa_build must provide a consistent version of that
-  # as a dependency of wxwidgets.
+  # and therefore (now that epa_build has a gtk+ configuration)
+  # we must specificially add gtk+ as a dependency of wxwidgets.
+  list(APPEND dependencies_LIST gtk+)
 endif(MSYS_PLATFORM)
 
 set(CFLAGS "$ENV{CFLAGS}")

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