ENH: Added support for using backslash-style escaping in CMakeLists.txt file arguments. This allows double quotes to be used in arguments.

5 files changed, 30 insertions, 32 deletions

diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt
index 3fb52de..5bae440 100644
--- a/Modules/CMakeLists.txt
+++ b/Modules/CMakeLists.txt
@@ -1,2 +1,2 @@
 # just install the modules
-INSTALL_FILES(/share/CMake/Modules .*\.cmake$)
+INSTALL_FILES(/share/CMake/Modules .*\\.cmake$)
diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake
index 4aa8daf..1fdf759 100644
--- a/Modules/FindDart.cmake
+++ b/Modules/FindDart.cmake
@@ -7,5 +7,5 @@ FIND_PATH(DART_ROOT README.INSTALL
     ${PROJECT_SOURCE_DIR}/Dart 
      /usr/share/Dart 
     "C:/Program Files/Dart" 
-    [HKEY_LOCAL_MACHINE\SOFTWARE\Dart\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Dart\\InstallPath]
     )
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index c75d60e..c4a2a4c 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -10,14 +10,14 @@
         
 FIND_LIBRARY(JAVA_AWT_LIBRARY jawt 
   PATHS /usr/lib /usr/local/lib
-  "[HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\1.3;JavaHome]/lib"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
 )
 
 # add in the include path    
 FIND_PATH(JAVA_INCLUDE_PATH jni.h 
   /usr/include 
   /usr/local/include
-  "[HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\1.3;JavaHome]/include"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
 )
 
 FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h 
@@ -26,5 +26,3 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
 )
 
 FIND_PATH(JAVE_AWT_INCLUDE_PATH jawt.h ${JAVA_INCLUDE_PATH} )
-
-
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 22ea142..27c615a 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -13,8 +13,8 @@ FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
   PATHS
   /usr/lib
   /usr/local/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/libs/Debug
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/libs/Debug
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs/Debug
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs/Debug
 )
 
 FIND_LIBRARY(PYTHON_LIBRARY 
@@ -24,8 +24,8 @@ FIND_LIBRARY(PYTHON_LIBRARY
   /usr/lib/python2.1/config
   /usr/lib/python2.0/config
   /usr/local/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/libs
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/libs
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
 )
   
 FIND_PATH(PYTHON_INCLUDE_PATH Python.h
@@ -33,7 +33,7 @@ FIND_PATH(PYTHON_INCLUDE_PATH Python.h
   /usr/include/python2.1
   /usr/include/python2.0
   /usr/local/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include
 )
 
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index ceff756..3d4d92c 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -30,10 +30,10 @@ FIND_LIBRARY(TCL_LIBRARY
   /usr/lib 
   /usr/local/lib
   "C:/Program Files/Tcl/lib" 
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib
   "${TCL_TCLSH_PATH}/../lib"
   "${TK_WISH_PATH}/../lib"
 )
@@ -44,10 +44,10 @@ FIND_LIBRARY(TK_LIBRARY
   /usr/lib 
   /usr/local/lib
   "C:/Program Files/Tcl/lib" 
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2;Root]/lib
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib
   "${TCL_TCLSH_PATH}/../lib"
   "${TK_WISH_PATH}/../lib"
 )
@@ -56,10 +56,10 @@ FIND_PATH(TCL_INCLUDE_PATH tcl.h
   /usr/include 
   /usr/local/include
   "C:/Program Files/Tcl/include" 
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include
   "${TCL_TCLSH_PATH}/../include"
   "${TK_WISH_PATH}/../include"
 )
@@ -68,10 +68,10 @@ FIND_PATH(TK_INCLUDE_PATH tk.h
   /usr/include 
   /usr/local/include
   "C:/Program Files/Tcl/include" 
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include
   "${TCL_TCLSH_PATH}/../include"
   "${TK_WISH_PATH}/../include"
 )
@@ -80,10 +80,10 @@ FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
   /usr/include 
   /usr/local/include
   "C:/Program Files/Tcl/include" 
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.4;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.3;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2;Root]/include
-  [HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include
   "${TCL_TCLSH_PATH}/../include"
   "${TK_WISH_PATH}/../include"
 )