more changes to windows build to deal with spaces in the path

KOSTAT-Data-Science-Research · Dec 15, 2010 · 773bf74 · 773bf74
1 parent 992bdbe
commit 773bf74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
@@ -81,6 +81,9 @@ if(UNIX)
    endif()
 endif()
 
+# make sure the CMAKE_INSTALL_PREFIX uses a cmake style path
+file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
+
 # if there isn't an addin path defined and this is a development build
 # (detected by target=all and build-type=debug) then look for an addins
 # environment variable.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,8 +28,8 @@ if (NOT RSTUDIO_SESSION_WIN64)
    INSTALL(CODE "
       exec_program(git ARGS rev-parse HEAD
                    OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH)
-      configure_file (${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in
-                      ${CMAKE_CURRENT_BINARY_DIR}/SOURCE)
+      configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\"
+                      \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\")
     ")
 
    # install root docs