diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a2c5f5..db86098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,8 @@ endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
+include(GNUInstallDirs)
+
 add_library(${PROJECT_NAME} ${LIB_TYPE}
         Network.cpp
         RTPacket.cpp
@@ -40,16 +42,16 @@ add_library(${PROJECT_NAME} ${LIB_TYPE}
 
 target_include_directories(${PROJECT_NAME} 
         PUBLIC
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
+            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+            "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>"
         PRIVATE
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/External/tinyxml2
+            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/External/tinyxml2"
 )
 
 target_link_libraries(${PROJECT_NAME}
     PUBLIC 
-        $<$<STREQUAL:$<PLATFORM_ID>,Windows>:ws2_32>
-        $<$<STREQUAL:$<PLATFORM_ID>,Windows>:iphlpapi>
+        "$<$<STREQUAL:$<PLATFORM_ID>,Windows>:ws2_32>"
+        "$<$<STREQUAL:$<PLATFORM_ID>,Windows>:iphlpapi>"
 )
 
 # Enable C++14
@@ -89,8 +91,6 @@ endif()
 
 # ----------- INSTALL & EXPORT -----------
 
-include(GNUInstallDirs)
-
 set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
 
 install(EXPORT ${PROJECT_NAME}Targets
@@ -106,17 +106,17 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-		DESTINATION ${ConfigPackageLocation}
+        DESTINATION ${ConfigPackageLocation}
 )
 
-# 'make install' to the correct locations (provided by GNUInstallDirs).
+# 'make install' to the correct locations (provided by GNUInstallDirs)
 install(
         TARGETS ${PROJECT_NAME}
         EXPORT ${PROJECT_NAME}Targets
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # This is for Windows
-        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # This is for Windows
+        INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
 )
 
 # Copy along headers