mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-24 11:55:43 +00:00
Move cmake files around, add -D_GNU_SOURCE.
This commit is contained in:
parent
2790d35e06
commit
6944cba54e
@ -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)
|
||||
|
@ -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")
|
Loading…
Reference in New Issue
Block a user