Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 00:28:25 +00:00
Code Issues Releases Activity

Move cmake files around, add -D_GNU_SOURCE.

Browse Source
This commit is contained in:
Brenden Matthews 2009-12-09 15:56:07 -08:00
parent 2790d35e06
commit 6944cba54e
7 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6)
project(conky) project(conky)
# This is the directory for our custom CMake modules. # 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 # 'core' CMake stuff
include(Conky) include(Conky)
@ -20,8 +20,8 @@ include(ConkyPlatformChecks)
include(ConkyCPackSetup) include(ConkyCPackSetup)
# setup our configuration headers # setup our configuration headers
configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h) configure_file(${CMAKE_MODULE_PATH}/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}/build.h.in ${CMAKE_BINARY_DIR}/build.h)
# Finally, add some code # Finally, add some code
add_subdirectory(src) add_subdirectory(src)

2
cmake_modules/Conky.cmake → cmake/Conky.cmake
View File

@ -31,6 +31,8 @@ find_package(Threads)
set(conky_libs ${CMAKE_THREAD_LIBS_INIT}) set(conky_libs ${CMAKE_THREAD_LIBS_INIT})
set(conky_includes ${CMAKE_BINARY_DIR}) set(conky_includes ${CMAKE_BINARY_DIR})
add_definitions(-D_GNU_SOURCE) # Standard definitions
# Do version stuff # Do version stuff
set(VERSION_MAJOR "2") set(VERSION_MAJOR "2")
set(VERSION_MINOR "0") set(VERSION_MINOR "0")

0
cmake_modules/ConkyBuildOptions.cmake → cmake/ConkyBuildOptions.cmake
View File

0
cmake_modules/ConkyCPackSetup.cmake → cmake/ConkyCPackSetup.cmake
View File

0
cmake_modules/ConkyPlatformChecks.cmake → cmake/ConkyPlatformChecks.cmake
View File

0
build.h.in → cmake/build.h.in
View File

0
config.h.in → cmake/config.h.in
View File