Revision: 45947
http://brlcad.svn.sourceforge.net/brlcad/?rev=45947&view=rev
Author: starseeker
Date: 2011-08-12 21:04:40 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Cleanup, delete leftover code.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-08-12 20:59:15 UTC (rev 45946)
+++ brlcad/trunk/CMakeLists.txt 2011-08-12 21:04:40 UTC (rev 45947)
@@ -592,19 +592,12 @@
SET(BRLCAD_BUNDLED_LIBS "Auto" CACHE STRING "Build bundled libraries.")
ENDIF(NOT BRLCAD_BUNDLED_LIBS)
set_property(CACHE ${optname} PROPERTY STRINGS Bundled System Auto)
-IF(NOT BRLCAD_BUNDLED_LIBS MATCHES "Auto" AND NOT BRLCAD_BUNDLED_LIBS
- MATCHES "Bundled" AND NOT BRLCAD_BUNDLED_LIBS MATCHES "System")
+IF(NOT BRLCAD_BUNDLED_LIBS STREQUAL "Auto" AND NOT BRLCAD_BUNDLED_LIBS
STREQUAL "Bundled" AND NOT BRLCAD_BUNDLED_LIBS STREQUAL "System")
MESSAGE(WARNING "Unknown value BRLCAD_BUNDLED_LIBS supplied for
${optname} - defaulting to Auto")
- MESSAGE(WARNING "Valid options are Auto, Bundled
- and System")
- SET(${optname} "Auto" CACHE STRING "Build
- bundled libraries.")
-ENDIF(NOT BRLCAD_BUNDLED_LIBS MATCHES "Auto" AND
- NOT BRLCAD_BUNDLED_LIBS
- MATCHES "Bundled" AND NOT
- BRLCAD_BUNDLED_LIBS MATCHES "System")
-BUNDLE_OPTION(BRLCAD_BUNDLED_LIBS "Auto")
+ MESSAGE(WARNING "Valid options are Auto, Bundled and System")
+ SET(${optname} "Auto" CACHE STRING "Build bundled libraries."
FORCE)
+ENDIF(NOT BRLCAD_BUNDLED_LIBS STREQUAL "Auto" AND NOT BRLCAD_BUNDLED_LIBS
STREQUAL "Bundled" AND NOT BRLCAD_BUNDLED_LIBS STREQUAL "System")
# Enable Aqua widgets on Mac OSX. This impacts Tcl/Tk building and OpenGL
# building. Not currently working - needs work in at least Tk and togl
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
