Revision: 45970
http://brlcad.svn.sourceforge.net/brlcad/?rev=45970&view=rev
Author: starseeker
Date: 2011-08-13 17:46:04 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
do some validation on auto_options - probably should at least make these case
insensitive, figure out best way to do that later.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-08-13 06:57:24 UTC (rev
45969)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-08-13 17:46:04 UTC (rev
45970)
@@ -43,8 +43,7 @@
ENDIF(${optname} STREQUAL "Auto (B)" OR ${optname} STREQUAL "Auto (S)"
OR ${optname} STREQUAL "Auto")
set_property(CACHE ${optname} PROPERTY STRINGS Auto Bundled System)
IF(NOT ${${optname}} STREQUAL "Auto" AND NOT ${${optname}} STREQUAL
"Bundled" AND NOT ${${optname}} STREQUAL "System" AND NOT ${${optname}}
STREQUAL "Auto (B)" AND NOT ${${optname}} STREQUAL "Auto (S)")
- MESSAGE(WARNING "Unknown value ${${optname}} supplied for
${optname} - defaulting to Auto")
- MESSAGE(WARNING "Valid options are Auto, Bundled and System")
+ MESSAGE(WARNING "Unknown value ${${optname}} supplied for
${optname} - defaulting to Auto\nValid options are Auto, Bundled and System")
SET(${optname} "Auto" CACHE STRING "Build bundled libraries."
FORCE)
ENDIF(NOT ${${optname}} STREQUAL "Auto" AND NOT ${${optname}} STREQUAL
"Bundled" AND NOT ${${optname}} STREQUAL "System" AND NOT ${${optname}}
STREQUAL "Auto (B)" AND NOT ${${optname}} STREQUAL "Auto (S)")
ENDMACRO()
@@ -53,9 +52,13 @@
MACRO(AUTO_OPTION username varname debug_state release_state)
STRING(LENGTH "${${username}}" ${username}_SET)
IF(NOT ${username}_SET)
- SET(${username} "Auto" CACHE STRING "Use optimized compiler
settings" FORCE)
+ SET(${username} "Auto" CACHE STRING "auto option" FORCE)
ENDIF(NOT ${username}_SET)
set_property(CACHE ${username} PROPERTY STRINGS Auto "ON" "OFF")
+ IF(NOT ${${username}} STREQUAL "Auto" AND NOT ${${username}} STREQUAL
"ON" AND NOT ${${username}} STREQUAL "OFF")
+ MESSAGE(WARNING "Unknown value ${${username}} supplied for
${username} - defaulting to Auto.\nValid options are Auto, ON and OFF")
+ SET(${username} "Auto" CACHE STRING "auto option" FORCE)
+ ENDIF(NOT ${${username}} STREQUAL "Auto" AND NOT ${${username}}
STREQUAL "ON" AND NOT ${${username}} STREQUAL "OFF")
# If the "parent" setting isn't Auto, do what it says
IF(NOT ${${username}} STREQUAL "Auto")
SET(${varname} ${${username}})
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
