--- a/project_files/Android-build/CMakeLists.txt	Sat Nov 12 18:02:55 2011 +0100
+++ b/project_files/Android-build/CMakeLists.txt	Mon Nov 14 17:59:26 2011 +0100
@@ -22,7 +22,7 @@
     find_path(ANDROID_NDK ndk-build)
 endif()
 
-if(IS_DIRECTORY ${ANDROID_NDK})
+if(IS_DIRECTORY "${ANDROID_NDK}")
     MESSAGE(STATUS "Detected the android NDK directory at: " ${ANDROID_NDK}) 
 else ()
     MESSAGE(FATAL_ERROR "Couldn't detect the Android NDK directory")
@@ -30,11 +30,11 @@
 
 if(NOT ANDROID_SDK)#Check if its defined at the cmdline
     find_path(ANDROID_SDK adb ) #assume they've added platform-tools to their path
-    get_filename_component(ANDROID_SDK ${ANDROID_SDK} PATH)
-    set(ANDROID_SDK ${ANDROID_SDK} CACHE PATH "Path to the android sdk" FORCE)
+    get_filename_component(ANDROID_SDK "${ANDROID_SDK}" PATH)
+    set(ANDROID_SDK "${ANDROID_SDK}" CACHE PATH "Path to the android sdk" FORCE)
 endif()
 
-if( IS_DIRECTORY ${ANDROID_SDK})
+if( IS_DIRECTORY "${ANDROID_SDK}")
     MESSAGE(STATUS "Detected the android SDK directory at: " ${ANDROID_SDK}) 
 else ()
     MESSAGE(FATAL_ERROR "Couldn't detect the Android SDK directory")
@@ -42,12 +42,12 @@
 
 if( NOT FPC_DIR)
     find_path(FPC_DIR ppcrossarm)
-    get_filename_component(FPC_DIR ${FPC_DIR} PATH)
-    set(FPC_DIR ${FPC_DIR} CACHE PATH "Path to fpc dir used in the android port" FORCE)
+    get_filename_component(FPC_DIR "${FPC_DIR}" PATH)
+    set(FPC_DIR "${FPC_DIR}" CACHE PATH "Path to fpc dir used in the android port" FORCE)
 endif()
 
-if( IS_DIRECTORY ${FPC_DIR})
-    MESSAGE(STATUS "Detected the FreePascal directory at: " ${FPC_DIR}) 
+if( IS_DIRECTORY "${FPC_DIR}")
+    MESSAGE(STATUS "Detected the FreePascal directory at: " "${FPC_DIR}") 
 else ()
     MESSAGE(FATAL_ERROR "Couldn't detect the FreePascal directory")
 endif()