[Cmake-commits] [cmake-commits] king committed cmCacheManager.cxx 1.108 1.109 cmSetPropertyCommand.cxx 1.10 1.11

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13116/Source

Modified Files:
	cmCacheManager.cxx cmSetPropertyCommand.cxx 
Log Message:
ENH: Define STRINGS cache entry property

This property defines a list of values for a cache entry of type STRING.
A CMake GUI may optionally use a drop-down selection widget for the
entry instead of a generic text entry field.  We do not enforce that the
value of the entry match one of the strings listed.


Index: cmCacheManager.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.cxx,v
retrieving revision 1.108
retrieving revision 1.109
diff -C 2 -d -r1.108 -r1.109
*** cmCacheManager.cxx	12 Mar 2009 14:49:04 -0000	1.108
--- cmCacheManager.cxx	12 Mar 2009 14:52:37 -0000	1.109
***************
*** 358,361 ****
--- 358,362 ----
    "ADVANCED",
    "MODIFIED",
+   "STRINGS",
    0
  };
***************
*** 989,992 ****
--- 990,1003 ----
  
    cm->DefineProperty
+     ("STRINGS", cmProperty::CACHE,
+      "Enumerate possible STRING entry values for GUI selection.",
+      "For cache entries with type STRING, this enumerates a set of values.  "
+      "CMake GUIs may use this to provide a selection widget instead of a "
+      "generic string entry field.  "
+      "This is for convenience only.  "
+      "CMake does not enforce that the value matches one of those listed."
+       );
+ 
+   cm->DefineProperty
      ("VALUE", cmProperty::CACHE,
       "Value of a cache entry.",

Index: cmSetPropertyCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSetPropertyCommand.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmSetPropertyCommand.cxx	10 Mar 2009 15:10:59 -0000	1.10
--- cmSetPropertyCommand.cxx	12 Mar 2009 14:52:40 -0000	1.11
***************
*** 420,423 ****
--- 420,424 ----
      }
    else if(this->PropertyName != "HELPSTRING" &&
+           this->PropertyName != "STRINGS" &&
            this->PropertyName != "VALUE")
      {
***************
*** 425,429 ****
      e << "given invalid CACHE property " << this->PropertyName << ".  "
        << "Settable CACHE properties are: "
!       << "ADVANCED, HELPSTRING, TYPE, and VALUE.";
      this->SetError(e.str().c_str());
      return false;
--- 426,430 ----
      e << "given invalid CACHE property " << this->PropertyName << ".  "
        << "Settable CACHE properties are: "
!       << "ADVANCED, HELPSTRING, STRINGS, TYPE, and VALUE.";
      this->SetError(e.str().c_str());
      return false;