From 1d6697f11d1bbcd628e6e33eb76c2e49df13abe7 Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Fri, 12 Aug 2011 14:25:42 +0200
Subject: [PATCH] use cmake_module_path for includes of cmakemodules

---
 CMakeLists.txt     |    8 ++++----
 src/CMakeLists.txt |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8831b3d..cea9dd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT( tomahawk )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
+SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
 IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
   CMAKE_POLICY(SET CMP0017 NEW)
@@ -28,9 +28,9 @@ option(BUILD_GUI "Build Tomahawk with GUI" ON)
 # generate version string
 IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
   # Use the date as the tweak level.
-  INCLUDE( ${CMAKE_MODULE_PATH}/CMakeDateStamp.cmake )
+  INCLUDE( CMakeDateStamp )
   SET( TOMAHAWK_VERSION_TWEAK "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-  INCLUDE( ${CMAKE_MODULE_PATH}/CMakeVersionSource.cmake )
+  INCLUDE( CMakeVersionSource )
 ENDIF()
 
 SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
@@ -54,7 +54,7 @@ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
 # installer creation
-INCLUDE( CPack.cmake )
+INCLUDE( CPack )
 
 #deps
 INCLUDE( MacroOptionalFindPackage )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6bda3e7..2a1cc32 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
 INCLUDE( ${QT_USE_FILE} )
-INCLUDE( ${CMAKE_SOURCE_DIR}/CMakeModules/AddAppIconMacro.cmake )
+INCLUDE( AddAppIconMacro )
 
 #SET( CMAKE_BUILD_TYPE "Release" )
 SET( CMAKE_VERBOSE_MAKEFILE ON )
-- 
1.7.4.1