From d5aa975675c2bacfe91dd7199143b79fa4ac324d Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 27 Feb 2013 23:44:20 +0100
Subject: [PATCH] Fix some issues that seem to have appeared in the CMake
 configuration.

---
 CMakeLists.txt           | 6 +++---
 cmake/OpenMWMacros.cmake | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbab836907..4b092e922d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,7 +378,7 @@ if(WIN32)
         "${OpenMW_SOURCE_DIR}/readme.txt"
         "${OpenMW_SOURCE_DIR}/GPL3.txt"
         "${OpenMW_SOURCE_DIR}/OFL.txt"
-        "${OpenMW_SOURCE_DIR}/Bitstream Vera License.txt"
+        "${OpenMW_SOURCE_DIR}/DejaVu Font License.txt"
         "${OpenMW_SOURCE_DIR}/Daedric Font License.txt"
         "${OpenMW_BINARY_DIR}/launcher.qss"
         "${OpenMW_BINARY_DIR}/settings-default.cfg"
@@ -389,7 +389,7 @@ if(WIN32)
     INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ".")
 
     SET(CPACK_GENERATOR "NSIS")
-    SET(CPACK_PACKAGE_NAME "OpenMW ${OPENMW_VERSION}")
+    SET(CPACK_PACKAGE_NAME "OpenMW")
     SET(CPACK_PACKAGE_VENDOR "OpenMW.org")
     SET(CPACK_PACKAGE_VERSION ${OPENMW_VERSION})
     SET(CPACK_PACKAGE_VERSION_MAJOR ${OPENMW_VERSION_MAJOR})
@@ -404,7 +404,7 @@ if(WIN32)
     SET(CPACK_RESOURCE_FILE_README "${OpenMW_SOURCE_DIR}/readme.txt")
     SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenMW_SOURCE_DIR}/readme.txt")
     SET(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
-    SET(CPACK_NSIS_DISPLAY_NAME "OpenMW")
+    SET(CPACK_NSIS_DISPLAY_NAME "OpenMW ${OPENMW_VERSION}")
     SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org")
     SET(CPACK_NSIS_INSTALLED_ICON_NAME "omwlauncher.exe")
diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake
index f2382fd8ac..f66dbf2c47 100644
--- a/cmake/OpenMWMacros.cmake
+++ b/cmake/OpenMWMacros.cmake
@@ -2,7 +2,7 @@
 macro (add_openmw_dir dir)
 set (files)
 foreach (u ${ARGN})
-file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.[ch]pp")
+file (GLOB ALL "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND OPENMW_FILES "${f}")
@@ -14,7 +14,7 @@ endmacro (add_openmw_dir)
 macro (add_component_dir dir)
 set (files)
 foreach (u ${ARGN})
-file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.[ch]pp")
+file (GLOB ALL "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND COMPONENT_FILES "${f}")
@@ -26,12 +26,12 @@ endmacro (add_component_dir)
 macro (add_component_qt_dir dir)
 set (files)
 foreach (u ${ARGN})
-file (GLOB ALL ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.[ch]pp")
+file (GLOB ALL "${dir}/${u}.[ch]pp")
 foreach (f ${ALL})
 list (APPEND files "${f}")
 list (APPEND COMPONENT_FILES "${f}")
 endforeach (f)
-file (GLOB MOC_H ${CMAKE_CURRENT_SOURCE_DIR} "${dir}/${u}.hpp")
+file (GLOB MOC_H "${dir}/${u}.hpp")
 foreach (fi ${MOC_H})
 list (APPEND COMPONENT_MOC_FILES "${fi}")
 endforeach (fi)