From: <ai...@us...> - 2009-07-15 20:17:31
|
Revision: 10149 http://plplot.svn.sourceforge.net/plplot/?rev=10149&view=rev Author: airwin Date: 2009-07-15 20:17:12 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Implement graceful recovery if no working C++ compiler. Modified Paths: -------------- trunk/cmake/modules/octave.cmake trunk/cmake/modules/psttf.cmake Modified: trunk/cmake/modules/octave.cmake =================================================================== --- trunk/cmake/modules/octave.cmake 2009-07-15 19:47:17 UTC (rev 10148) +++ trunk/cmake/modules/octave.cmake 2009-07-15 20:17:12 UTC (rev 10149) @@ -26,6 +26,12 @@ option(ENABLE_octave "Enable Octave bindings" ON) endif(DEFAULT_NO_BINDINGS) +if(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS) + message(STATUS "WARNING: " + "Octave requires working C++ compiler to build. Disabling octave bindings") + set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE) +endif(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS) + if(ENABLE_octave AND NOT BUILD_SHARED_LIBS) message(STATUS "WARNING: " "Octave requires shared libraries. Disabling octave bindings") Modified: trunk/cmake/modules/psttf.cmake =================================================================== --- trunk/cmake/modules/psttf.cmake 2009-07-15 19:47:17 UTC (rev 10148) +++ trunk/cmake/modules/psttf.cmake 2009-07-15 20:17:12 UTC (rev 10149) @@ -36,6 +36,15 @@ # set the environment variable CMAKE_LIBRARY_PATH. # See cmake documentation for further details. +if(PLD_psttf) + if(NOT CMAKE_CXX_COMPILER_WORKS) + message(STATUS "WARNING: no working C++ compiler so " + "setting psttf device to OFF." + ) + set(PLD_psttf OFF CACHE BOOL "Enable psttf device" FORCE) + endif(NOT CMAKE_CXX_COMPILER_WORKS) +endif(PLD_psttf) + # Look for psttf headers and libraries with pkg-config if(PLD_psttf) if(NOT PKG_CONFIG_EXECUTABLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |