Revision: 44571
http://brlcad.svn.sourceforge.net/brlcad/?rev=44571&view=rev
Author: erikgreenwald
Date: 2011-05-05 20:35:16 +0000 (Thu, 05 May 2011)
Log Message:
-----------
allow togl on non-X11 platforms. Mark TOGL_LIBRARIES and TOGL_INCLUDE_DIRS as
advanced.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-05-05 20:34:23 UTC (rev
44570)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-05-05 20:35:16 UTC (rev
44571)
@@ -1004,10 +1004,12 @@
# For now only turn on Togl for X11, but will need it everywhere eventually.
Will need
# some logic to both look for package require and the C library, as both APIs
will be needed.
-IF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+IF(BRLCAD-ENABLE_OPENGL)
SET(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
SET(TOGL_INCLUDE_DIRS
"${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include"
CACHE STRING "Togl include path" FORCE)
- ADD_SUBDIRECTORY(togl)
+ MARK_AS_ADVANCED(TOGL_LIBRARIES)
+ MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
+ ADD_SUBDIRECTORY(togl)
SET(togl_ignore_files
CMake
LICENSE
@@ -1017,7 +1019,7 @@
doc
include
tools
- )
+ )
DISTCHECK_IGNORE(togl togl_ignore_files)
SET(togl_src_ignore_files
Togl.py
@@ -1029,7 +1031,7 @@
toglGLX.c
toglNSOpenGL.c
toglWGL.c
- )
+ )
DISTCHECK_IGNORE(togl/src togl_src_ignore_files)
SET(togl_demo_ignore_files
ben.rgb
@@ -1049,11 +1051,11 @@
texture.c
texture.tcl
tree2.rgba
- )
+ )
DISTCHECK_IGNORE(togl/demo togl_demo_ignore_files)
-ELSE(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ELSE(BRLCAD-ENABLE_OPENGL)
DISTCHECK_IGNORE_ITEM(togl)
-ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ENDIF(BRLCAD-ENABLE_OPENGL)
# jove editor - technically this isn't a library,
# but traditionally it's grouped into the "enable-all"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
