From 6944cba54eff5535bb3ca6b824cf3685b0e30162 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@diddyinc.com>
Date: Wed, 9 Dec 2009 15:56:07 -0800
Subject: [PATCH] Move cmake files around, add -D_GNU_SOURCE.

---
 CMakeLists.txt                                     | 6 +++---
 {cmake_modules => cmake}/Conky.cmake               | 2 ++
 {cmake_modules => cmake}/ConkyBuildOptions.cmake   | 0
 {cmake_modules => cmake}/ConkyCPackSetup.cmake     | 0
 {cmake_modules => cmake}/ConkyPlatformChecks.cmake | 0
 build.h.in => cmake/build.h.in                     | 0
 config.h.in => cmake/config.h.in                   | 0
 7 files changed, 5 insertions(+), 3 deletions(-)
 rename {cmake_modules => cmake}/Conky.cmake (98%)
 rename {cmake_modules => cmake}/ConkyBuildOptions.cmake (100%)
 rename {cmake_modules => cmake}/ConkyCPackSetup.cmake (100%)
 rename {cmake_modules => cmake}/ConkyPlatformChecks.cmake (100%)
 rename build.h.in => cmake/build.h.in (100%)
 rename config.h.in => cmake/config.h.in (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 938b88d3..12f5020c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6)
 project(conky)
 
 # This is the directory for our custom CMake modules.
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # 'core' CMake stuff
 include(Conky)
@@ -20,8 +20,8 @@ include(ConkyPlatformChecks)
 include(ConkyCPackSetup)
 
 # setup our configuration headers
-configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-configure_file(${CMAKE_SOURCE_DIR}/build.h.in ${CMAKE_BINARY_DIR}/build.h)
+configure_file(${CMAKE_MODULE_PATH}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
+configure_file(${CMAKE_MODULE_PATH}/build.h.in ${CMAKE_BINARY_DIR}/build.h)
 
 # Finally, add some code
 add_subdirectory(src)
diff --git a/cmake_modules/Conky.cmake b/cmake/Conky.cmake
similarity index 98%
rename from cmake_modules/Conky.cmake
rename to cmake/Conky.cmake
index 06a43126..f862cb50 100644
--- a/cmake_modules/Conky.cmake
+++ b/cmake/Conky.cmake
@@ -31,6 +31,8 @@ find_package(Threads)
 set(conky_libs ${CMAKE_THREAD_LIBS_INIT})
 set(conky_includes ${CMAKE_BINARY_DIR})
 
+add_definitions(-D_GNU_SOURCE) # Standard definitions
+
 # Do version stuff
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "0")
diff --git a/cmake_modules/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
similarity index 100%
rename from cmake_modules/ConkyBuildOptions.cmake
rename to cmake/ConkyBuildOptions.cmake
diff --git a/cmake_modules/ConkyCPackSetup.cmake b/cmake/ConkyCPackSetup.cmake
similarity index 100%
rename from cmake_modules/ConkyCPackSetup.cmake
rename to cmake/ConkyCPackSetup.cmake
diff --git a/cmake_modules/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
similarity index 100%
rename from cmake_modules/ConkyPlatformChecks.cmake
rename to cmake/ConkyPlatformChecks.cmake
diff --git a/build.h.in b/cmake/build.h.in
similarity index 100%
rename from build.h.in
rename to cmake/build.h.in
diff --git a/config.h.in b/cmake/config.h.in
similarity index 100%
rename from config.h.in
rename to cmake/config.h.in