diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfc3a66..fb519bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,121 +1,126 @@
-# Copyright(c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of NVIDIA CORPORATION nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cmake_minimum_required(VERSION 3.2)
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-project(VulkanHppGenerator)
-
-if(MSVC)
-  add_compile_options(/W4)
-else(MSVC)
-  add_compile_options(-Wall)
-endif(MSVC)
-
-set(CMAKE_CXX_STANDARD 14)
-
-if (NOT DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR)
-  set(VULKAN_HPP_VULKAN_HEADERS_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-endif()
-file(TO_NATIVE_PATH ${VULKAN_HPP_VULKAN_HEADERS_SRC_DIR}/registry/vk.xml vk_spec)
-string(REPLACE "\\" "\\\\" vk_spec ${vk_spec})
-add_definitions(-DVK_SPEC="${vk_spec}")
-
-if (NOT DEFINED VULKAN_HPP_PATH)
-  set(VULKAN_HPP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/vulkan")
-endif()
-file(TO_NATIVE_PATH ${VULKAN_HPP_PATH}/vulkan.hpp vulkan_hpp)
-string(REPLACE "\\" "\\\\" vulkan_hpp ${vulkan_hpp})
-add_definitions(-DVULKAN_HPP_FILE="${vulkan_hpp}")
-include_directories(${VULKAN_HPP_PATH})
-
-
-set(HEADERS
-  VulkanHppGenerator.hpp
-)
-
-set(SOURCES
-  VulkanHppGenerator.cpp
-)
-
-if (NOT DEFINED VULKAN_HPP_TINYXML2_SRC_DIR)
-  set(VULKAN_HPP_TINYXML2_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tinyxml2")
-endif()
-
-set(TINYXML2_SOURCES
-  ${VULKAN_HPP_TINYXML2_SRC_DIR}/tinyxml2.cpp
-)
-
-set(TINYXML2_HEADERS
-  ${VULKAN_HPP_TINYXML2_SRC_DIR}/tinyxml2.h
-)
-
-source_group(headers FILES ${HEADERS})
-source_group(sources FILES ${SOURCES})
-
-source_group(TinyXML2\\headers FILES ${TINYXML2_HEADERS})
-source_group(TinyXML2\\sources FILES ${TINYXML2_SOURCES})
-
-add_executable(VulkanHppGenerator
-  ${HEADERS}
-  ${SOURCES}
-  ${TINYXML2_SOURCES}
-  ${TINYXML2_HEADERS}
-)
-
-set_property(TARGET VulkanHppGenerator PROPERTY CXX_STANDARD 14)
-
-target_include_directories(VulkanHppGenerator PRIVATE ${VULKAN_HPP_TINYXML2_SRC_DIR})
-
-option (VULKAN_HPP_RUN_GENERATOR "Run the HPP generator" OFF)
-if (VULKAN_HPP_RUN_GENERATOR)
-  add_custom_command(
-    COMMAND VulkanHppGenerator
-    OUTPUT "${vulkan_hpp}"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    COMMENT "run VulkanHppGenerator"
-    DEPENDS VulkanHppGenerator "${vk_spec}")
-
-  add_custom_target(build_vulkan_hpp ALL
-    DEPENDS "${vulkan_hpp}" "${vk_spec}")
-endif()
-
-option (SAMPLES_BUILD "Build samples" OFF)
-if (SAMPLES_BUILD)
-  add_subdirectory(glfw)
-  add_subdirectory(glslang)
-  add_subdirectory(samples)
-endif (SAMPLES_BUILD)
-
-option (TESTS_BUILD "Build tests" OFF)
-if (TESTS_BUILD)
-  add_subdirectory(tests)
-endif (TESTS_BUILD)
-
-if (${VULKAN_HPP_INSTALL})
-  install(FILES ${vulkan_hpp} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vulkan)
-endif()
+# Copyright(c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#  * Neither the name of NVIDIA CORPORATION nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cmake_minimum_required(VERSION 3.2)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+project(VulkanHppGenerator)
+
+if(MSVC)
+  add_compile_options(/W4)
+else(MSVC)
+  add_compile_options(-Wall)
+endif(MSVC)
+
+set(CMAKE_CXX_STANDARD 14)
+
+if (NOT DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR)
+  set(VULKAN_HPP_VULKAN_HEADERS_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
+endif()
+file(TO_NATIVE_PATH ${VULKAN_HPP_VULKAN_HEADERS_SRC_DIR}/registry/vk.xml vk_spec)
+string(REPLACE "\\" "\\\\" vk_spec ${vk_spec})
+add_definitions(-DVK_SPEC="${vk_spec}")
+
+if (NOT DEFINED VULKAN_HPP_PATH)
+  set(VULKAN_HPP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/vulkan")
+endif()
+file(TO_NATIVE_PATH ${VULKAN_HPP_PATH}/vulkan.hpp vulkan_hpp)
+string(REPLACE "\\" "\\\\" vulkan_hpp ${vulkan_hpp})
+add_definitions(-DVULKAN_HPP_FILE="${vulkan_hpp}")
+include_directories(${VULKAN_HPP_PATH})
+
+
+set(HEADERS
+  VulkanHppGenerator.hpp
+)
+
+set(SOURCES
+  VulkanHppGenerator.cpp
+)
+
+if (NOT DEFINED VULKAN_HPP_TINYXML2_SRC_DIR)
+  set(VULKAN_HPP_TINYXML2_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tinyxml2")
+endif()
+
+set(TINYXML2_SOURCES
+  ${VULKAN_HPP_TINYXML2_SRC_DIR}/tinyxml2.cpp
+)
+
+set(TINYXML2_HEADERS
+  ${VULKAN_HPP_TINYXML2_SRC_DIR}/tinyxml2.h
+)
+
+source_group(headers FILES ${HEADERS})
+source_group(sources FILES ${SOURCES})
+
+source_group(TinyXML2\\headers FILES ${TINYXML2_HEADERS})
+source_group(TinyXML2\\sources FILES ${TINYXML2_SOURCES})
+
+add_executable(VulkanHppGenerator
+  ${HEADERS}
+  ${SOURCES}
+  ${TINYXML2_SOURCES}
+  ${TINYXML2_HEADERS}
+)
+
+set_property(TARGET VulkanHppGenerator PROPERTY CXX_STANDARD 14)
+
+target_include_directories(VulkanHppGenerator PRIVATE ${VULKAN_HPP_TINYXML2_SRC_DIR})
+
+option (VULKAN_HPP_RUN_GENERATOR "Run the HPP generator" OFF)
+if (VULKAN_HPP_RUN_GENERATOR)
+  add_custom_command(
+    COMMAND VulkanHppGenerator
+    OUTPUT "${vulkan_hpp}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+    COMMENT "run VulkanHppGenerator"
+    DEPENDS VulkanHppGenerator "${vk_spec}")
+
+  add_custom_target(build_vulkan_hpp ALL
+    DEPENDS "${vulkan_hpp}" "${vk_spec}")
+endif()
+
+option (SAMPLES_BUILD "Build samples" OFF)
+if (SAMPLES_BUILD)
+  # external libraries
+  add_subdirectory(glm)
+  set(GLFW_BUILD_EXAMPLES OFF)
+  set(GLFW_BUILD_TESTS OFF)
+  add_subdirectory(glfw)
+  add_subdirectory(glslang)
+  # samples
+  add_subdirectory(samples)
+endif ()
+
+option (TESTS_BUILD "Build tests" OFF)
+if (TESTS_BUILD)
+  add_subdirectory(tests)
+endif ()
+
+if (${VULKAN_HPP_INSTALL})
+  install(FILES ${vulkan_hpp} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vulkan)
+endif()
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 5cb7d4f..8f00f03 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -40,8 +40,6 @@ else()
   include_directories("${Vulkan_INCLUDE_DIRS}")
 endif()
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm")
-
 FOREACH( linkunit ${linkunits} )
   if( IS_DIRECTORY ${linkunit} )
     if( EXISTS ${linkunit}/CMakeLists.txt )
diff --git a/samples/utils/CMakeLists.txt b/samples/utils/CMakeLists.txt
index 09b8c25..06ae47c 100644
--- a/samples/utils/CMakeLists.txt
+++ b/samples/utils/CMakeLists.txt
@@ -36,6 +36,7 @@ add_library(utils
   ${HEADERS}
 )
 
+target_link_libraries(utils PUBLIC glm)
 target_link_libraries(utils PUBLIC glfw)
 target_link_libraries(utils PUBLIC glslang)
 target_link_libraries(utils PUBLIC glslang-default-resource-limits)