Fixed #605

4 files changed, 31 insertions, 31 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c368309..dd506471 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,17 +14,17 @@ include(LibFindMacros)
 
 IF(APPLE)
   set(additional_includes
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/include
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/include"
     /usr/include/tidy
     /usr/include/libxml2
   )
   
   set(additional_lib_searchpath
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/lib
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/lib
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/lib
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/lib"
   )
   
   execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/prepare.sh"
@@ -167,10 +167,10 @@ file(COPY
   ${public_headers}
 
   DESTINATION
-  ${CMAKE_CURRENT_BINARY_DIR}/include/MailCore
+  "${CMAKE_CURRENT_BINARY_DIR}/include/MailCore"
 )
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/include"
   ${async_includes}
   ${core_includes}
   ${objc_includes}
diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake
index c0076e28..929b200d 100644
--- a/src/cmake/async.cmake
+++ b/src/cmake/async.cmake
@@ -61,8 +61,8 @@ set(async_files
 # Includes for build
 
 set(async_includes
-  ${CMAKE_CURRENT_SOURCE_DIR}/async
-  ${CMAKE_CURRENT_SOURCE_DIR}/async/imap
-  ${CMAKE_CURRENT_SOURCE_DIR}/async/pop
-  ${CMAKE_CURRENT_SOURCE_DIR}/async/smtp
+  "${CMAKE_CURRENT_SOURCE_DIR}/async"
+  "${CMAKE_CURRENT_SOURCE_DIR}/async/imap"
+  "${CMAKE_CURRENT_SOURCE_DIR}/async/pop"
+  "${CMAKE_CURRENT_SOURCE_DIR}/async/smtp"
 )
diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake
index a7ba18c9..8e95390d 100644
--- a/src/cmake/core.cmake
+++ b/src/cmake/core.cmake
@@ -120,16 +120,16 @@ set(core_files
 # Includes for build
 
 set(core_includes
-  ${CMAKE_CURRENT_SOURCE_DIR}/core
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/abstract
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/basetypes
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/imap
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/pop
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/provider
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/renderer
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/rfc822
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/security
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/smtp
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/zip
-  ${CMAKE_CURRENT_SOURCE_DIR}/core/zip/MiniZip
+  "${CMAKE_CURRENT_SOURCE_DIR}/core"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/abstract"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/basetypes"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/imap"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/pop"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/provider"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/renderer"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/rfc822"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/security"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/smtp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/zip"
+  "${CMAKE_CURRENT_SOURCE_DIR}/core/zip/MiniZip"
 )
diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake
index 06622187..7224c668 100644
--- a/src/cmake/objc.cmake
+++ b/src/cmake/objc.cmake
@@ -103,11 +103,11 @@ ENDIF()
 # Includes for build
 
 set(objc_includes
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/abstract
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/imap
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/pop
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/rfc822
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/smtp
-  ${CMAKE_CURRENT_SOURCE_DIR}/objc/utils
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/abstract"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/imap"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/pop"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/rfc822"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/smtp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/objc/utils"
 )