diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 55e4115fc..6a7c2dc11 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1,4 +1,7 @@
 # configure the .h file
+OPTION(CMAKE_STRICT   
+  "Perform strict testing to see if ANY properties or variables are used before being defined" OFF)
+
 CONFIGURE_FILE(
   "${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in"
   "${CMake_BINARY_DIR}/Source/cmConfigure.h"
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 8aeb58836..0824cdd4b 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -20,6 +20,7 @@
 #cmakedefine CMAKE_NO_ANSI_FOR_SCOPE
 #cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
 #cmakedefine HAVE_UNSETENV
+#cmakedefine CMAKE_STRICT
 #define  CMAKE_ROOT_DIR "${CMake_SOURCE_DIR}"
 #define  CMAKE_BUILD_DIR "${CMake_BINARY_DIR}"
 #define  CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}"
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index c69ca7bc7..68206947f 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -18,9 +18,6 @@
 #include "cmSystemTools.h"
 #include "cmake.h"
 
-// define STRICT to get checking of all set and get property calls
-//#define CMAKE_STRICT 
-
 cmProperty *cmPropertyMap::GetOrCreateProperty(const char *name)
 {
   cmPropertyMap::iterator it = this->find(name);