From: Alan W. I. <ai...@us...> - 2007-03-05 22:10:26
|
Update of /cvsroot/plplot/plplot/cmake/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5358 Modified Files: plplot.cmake wxwidgets.cmake Log Message: Implement DEFAULT_NO_BINDINGS option. Tweak ENABLE_wxwidgets logic. Index: wxwidgets.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/wxwidgets.cmake,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- wxwidgets.cmake 4 Feb 2007 23:31:19 -0000 1.11 +++ wxwidgets.cmake 5 Mar 2007 22:10:23 -0000 1.12 @@ -63,6 +63,18 @@ ${DRIVERS_LINK_FLAGS} ${wxwidgets_LINK_FLAGS} ) +endif(PLD_wxwidgets) + +if(PLD_wxwidgets) + if(DEFAULT_NO_BINDINGS) + option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF) + else(DEFAULT_NO_BINDINGS) + option(ENABLE_wxwidgets "Enable wxwidgets bindings" ON) + endif(DEFAULT_NO_BINDINGS) else(PLD_wxwidgets) + message(STATUS + "WARNING: PLD_wxwidgets is OFF so " + "Setting ENABLE_wxwidgets to OFF." + ) set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE) endif(PLD_wxwidgets) Index: plplot.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/plplot.cmake,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- plplot.cmake 26 Feb 2007 00:52:16 -0000 1.49 +++ plplot.cmake 5 Mar 2007 22:10:23 -0000 1.50 @@ -239,6 +239,10 @@ message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") message(STATUS "X11_LIBRARY_DIR = ${X11_LIBRARY_DIR}") +option(DEFAULT_NO_BINDINGS +"All language bindings are disabled by default" +OFF +) # Load language specific files include(c++) include(fortran) @@ -250,12 +254,8 @@ include(ada) # Find wxWidgets needed for driver and bindings -option( ENABLE_wxwidgets "Enable wxWidgets bindings" ON ) SET(wxWidgets_USE_LIBS core base) find_package(wxWidgets) -if( NOT wxWidgets_FOUND ) - set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE) -endif( NOT wxWidgets_FOUND ) # ======================================================================= # additional library support |