Author: piumarta
Date: 2009-08-31 13:29:49 -0700 (Mon, 31 Aug 2009)
New Revision: 2120
Modified:
trunk/platforms/unix/ChangeLog
trunk/platforms/unix/cmake/configure
trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
trunk/platforms/unix/vm/config.cmake
Log:
support configure --without-gl
Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-31 20:06:40 UTC (rev 2119)
+++ trunk/platforms/unix/ChangeLog 2009-08-31 20:29:49 UTC (rev 2120)
@@ -1,5 +1,13 @@
2009-08-31 <
[hidden email]>
+ * vm/config.cmake: Disable OpenGL and AGL if --without-gl.
+
+ * plugins/B3DAcceleratorPlugin/config.cmake: Disable plugin if
+ neither OPENGL nor AGL are available.
+
+ * cmake/configure (Usage): Document --without-gl and
+ --without-SUGAR in help message.
+
* vm/config.cmake: Configure SUGAR as 1 unless --without-SUGAR.
* plugins/SqueakFFIPrims/config.cmake: Correctly detect arch and
Modified: trunk/platforms/unix/cmake/configure
===================================================================
--- trunk/platforms/unix/cmake/configure 2009-08-31 20:06:40 UTC (rev 2119)
+++ trunk/platforms/unix/cmake/configure 2009-08-31 20:29:49 UTC (rev 2120)
@@ -1,6 +1,6 @@
#!/bin/sh
-# Last edited: 2009-08-27 19:57:45 by piumarta on emilia-2.local
+# Last edited: 2009-08-31 13:23:58 by piumarta on ubuntu.piumarta.com
help() {
cat <<EOF
@@ -11,6 +11,8 @@
--prefix=<directory> install into <prefix>/{bin,lib,man}
--CFLAGS=<flags> override default compiler flags
--without-<plugin> do not build the named plugin
+ --without-gl disable everything that depends on OpenGL
+ --without-SUGAR disable support for SUGAR environment
Notes:
1. By default the CFLAGS will be set to create optimised binaries. If you are
debugging the VM you probably want to use '--CFLAGS=-g' when invoking this
Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-31 20:06:40 UTC (rev 2119)
+++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-31 20:29:49 UTC (rev 2120)
@@ -1,6 +1,8 @@
IF (OPENGL_FOUND OR AGL_FOUND)
SET (USE_OPENGL 1)
PLUGIN_INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR})
+ELSE ()
+ PLUGIN_DISABLE ()
ENDIF ()
IF (OPENGL_FOUND)
Modified: trunk/platforms/unix/vm/config.cmake
===================================================================
--- trunk/platforms/unix/vm/config.cmake 2009-08-31 20:06:40 UTC (rev 2119)
+++ trunk/platforms/unix/vm/config.cmake 2009-08-31 20:29:49 UTC (rev 2120)
@@ -29,10 +29,12 @@
FIND_PACKAGE (X11)
LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR)
-FIND_PACKAGE (OpenGL)
-LIST (REMOVE_DUPLICATES OPENGL_INCLUDE_DIR)
+IF (NOT without-gl)
+ FIND_PACKAGE (OpenGL)
+ LIST (REMOVE_DUPLICATES OPENGL_INCLUDE_DIR)
+ENDIF ()
-IF (APPLE)
+IF (APPLE AND NOT without-gl)
SET (AGL_FOUND ${OPENGL_FOUND})
SET (AGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
SET (AGL_LIBRARIES ${OPENGL_LIBRARIES})
@@ -48,7 +50,7 @@
ELSE (X11_FOUND)
SET (OPENGL_FOUND)
ENDIF (X11_FOUND)
-ENDIF (APPLE)
+ENDIF (APPLE AND NOT without-gl)
# FOREACH (var AGL_FOUND AGL_INCLUDE_DIR AGL_LIBRARIES OPENGL_FOUND OPENGL_INCLUDE_DIR OPENGL_LIBRARIES)
# MESSAGE ("${var} = ${${var}}")
Locked
