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

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

Revision: 13068
          http://sourceforge.net/p/plplot/code/13068
Author:   airwin
Date:     2014-03-16 17:53:19 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
Straighten out the dependency mess for glib and gt-doc.

gtk-doc has a real dependency on glib so must add that dependency to
gtk-doc.  But that normally would introduce a circular dependency since glib
depends on gtk-doc!  So in addition to the gtk-doc package
change, fix that circular dependency by disabling use of gtk-doc for
glib, and dropping the dependency of glib on gtk-doc.

Modified Paths:
--------------
    trunk/cmake/epa_build/glib/CMakeLists.txt
    trunk/cmake/epa_build/gtk-doc/CMakeLists.txt

Modified: trunk/cmake/epa_build/glib/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/glib/CMakeLists.txt	2014-03-16 17:44:06 UTC (rev 13067)
+++ trunk/cmake/epa_build/glib/CMakeLists.txt	2014-03-16 17:53:19 UTC (rev 13068)
@@ -29,9 +29,9 @@
 
 # List of dependencies (most of which are build tools) which should be
 # ignored.
-set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list})
 
-set(dependencies_LIST gtk-doc;libffi)
+set(dependencies_LIST libffi)
 
 # Do boilerplate tasks that must be done for each different project
 # that is configured as part of epa_build.
@@ -68,7 +68,7 @@
   DEPENDS ${dependencies_targets}
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-installed-tests
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-installed-tests --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} 
   BUILD_IN_SOURCE OFF
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install

Modified: trunk/cmake/epa_build/gtk-doc/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/gtk-doc/CMakeLists.txt	2014-03-16 17:44:06 UTC (rev 13067)
+++ trunk/cmake/epa_build/gtk-doc/CMakeLists.txt	2014-03-16 17:53:19 UTC (rev 13068)
@@ -29,9 +29,9 @@
 
 # List of dependencies (most of which are build tools) which should be
 # ignored.
-set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list})
 
-set(dependencies_LIST docbook-xml;docbook-xsl;libxslt;yelp-tools)
+set(dependencies_LIST docbook-xml;docbook-xsl;glib;libxslt;yelp-tools)
 
 # Do boilerplate tasks that must be done for each different project
 # that is configured as part of epa_build.

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