From a2121709c6e39fe3640163e5a4b6b96b8b0f1ab8 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 16 Mar 2014 23:33:41 +0100
Subject: [PATCH] Move all CMake scripts one level up

Having them in cmake/modules/ just adds a pointless extra directory,
so let's move them directly into cmake/.
---
 CMakeLists.txt                                         | 6 +++---
 cmake/{modules => }/COPYING-CMAKE-SCRIPTS              | 0
 cmake/{modules => }/FindDBusMenuQt.cmake               | 0
 cmake/{modules => }/FindExecInfo.cmake                 | 0
 cmake/{modules => }/FindLibraryWithDebug.cmake         | 0
 cmake/{modules => }/FindLibsnore.cmake                 | 0
 cmake/{modules => }/FindPhonon.cmake                   | 0
 cmake/{modules => }/FindQCA2.cmake                     | 0
 cmake/{modules => }/GetGitRevisionDescription.cmake    | 0
 cmake/{modules => }/GetGitRevisionDescription.cmake.in | 0
 cmake/{modules => }/QuasselMacros.cmake                | 0
 cmake/{modules => }/README                             | 0
 12 files changed, 3 insertions(+), 3 deletions(-)
 rename cmake/{modules => }/COPYING-CMAKE-SCRIPTS (100%)
 rename cmake/{modules => }/FindDBusMenuQt.cmake (100%)
 rename cmake/{modules => }/FindExecInfo.cmake (100%)
 rename cmake/{modules => }/FindLibraryWithDebug.cmake (100%)
 rename cmake/{modules => }/FindLibsnore.cmake (100%)
 rename cmake/{modules => }/FindPhonon.cmake (100%)
 rename cmake/{modules => }/FindQCA2.cmake (100%)
 rename cmake/{modules => }/GetGitRevisionDescription.cmake (100%)
 rename cmake/{modules => }/GetGitRevisionDescription.cmake.in (100%)
 rename cmake/{modules => }/QuasselMacros.cmake (100%)
 rename cmake/{modules => }/README (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a9303d0..02957135 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,13 +34,13 @@ set(QUASSEL_MINOR 11)
 set(QUASSEL_PATCH  0)
 set(QUASSEL_VERSION_STRING "0.11-pre")
 
+# Tell CMake about or own stuff
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCXXCompilerFlag)
 
-# Use our own (well, and KDE's) version of some modules
-# In particular cmake's own FindQt4 and FindOpenSSL are quite buggy
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 include(QuasselMacros)
 
 # Various options and variables that can be set on the command line
diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
similarity index 100%
rename from cmake/modules/COPYING-CMAKE-SCRIPTS
rename to cmake/COPYING-CMAKE-SCRIPTS
diff --git a/cmake/modules/FindDBusMenuQt.cmake b/cmake/FindDBusMenuQt.cmake
similarity index 100%
rename from cmake/modules/FindDBusMenuQt.cmake
rename to cmake/FindDBusMenuQt.cmake
diff --git a/cmake/modules/FindExecInfo.cmake b/cmake/FindExecInfo.cmake
similarity index 100%
rename from cmake/modules/FindExecInfo.cmake
rename to cmake/FindExecInfo.cmake
diff --git a/cmake/modules/FindLibraryWithDebug.cmake b/cmake/FindLibraryWithDebug.cmake
similarity index 100%
rename from cmake/modules/FindLibraryWithDebug.cmake
rename to cmake/FindLibraryWithDebug.cmake
diff --git a/cmake/modules/FindLibsnore.cmake b/cmake/FindLibsnore.cmake
similarity index 100%
rename from cmake/modules/FindLibsnore.cmake
rename to cmake/FindLibsnore.cmake
diff --git a/cmake/modules/FindPhonon.cmake b/cmake/FindPhonon.cmake
similarity index 100%
rename from cmake/modules/FindPhonon.cmake
rename to cmake/FindPhonon.cmake
diff --git a/cmake/modules/FindQCA2.cmake b/cmake/FindQCA2.cmake
similarity index 100%
rename from cmake/modules/FindQCA2.cmake
rename to cmake/FindQCA2.cmake
diff --git a/cmake/modules/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
similarity index 100%
rename from cmake/modules/GetGitRevisionDescription.cmake
rename to cmake/GetGitRevisionDescription.cmake
diff --git a/cmake/modules/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in
similarity index 100%
rename from cmake/modules/GetGitRevisionDescription.cmake.in
rename to cmake/GetGitRevisionDescription.cmake.in
diff --git a/cmake/modules/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
similarity index 100%
rename from cmake/modules/QuasselMacros.cmake
rename to cmake/QuasselMacros.cmake
diff --git a/cmake/modules/README b/cmake/README
similarity index 100%
rename from cmake/modules/README
rename to cmake/README
-- 
2.20.1