From cf7610cf42eb474114f4d060c7f3baa48da6db21 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Wed, 7 Mar 2012 13:43:26 -0800 Subject: [PATCH] Build fix for defconfig.h. --- src/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 067bfaf6..3830ee17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,12 +33,15 @@ endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.h) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build.h) message(FATAL_ERROR "You must remove the autotools generated file '${CMAKE_CURRENT_SOURCE_DIR}/build.h' in order to build with CMake.") endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build.h) +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h) + message(FATAL_ERROR "You must remove the autotools generated file '${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h' in order to build with CMake.") +endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/defconfig.h) set(conky_sources c++wrap.cc colours.cc combine.cc common.cc conky.cc core.cc diskio.cc entropy.cc exec.cc fs.cc mail.cc mixer.cc net_stat.cc template.cc - mboxscan.cc read_tcpip.cc scroll.cc specials.cc tailhead.cc - temphelper.cc text_object.cc timeinfo.cc top.cc algebra.cc prioqueue.cc proc.cc - user.cc luamm.cc data-source.cc lua-config.cc setting.cc llua.cc update-cb.cc) + mboxscan.cc read_tcpip.cc scroll.cc specials.cc tailhead.cc temphelper.cc + text_object.cc timeinfo.cc top.cc algebra.cc prioqueue.cc proc.cc user.cc + luamm.cc data-source.cc lua-config.cc setting.cc llua.cc update-cb.cc) # Platform specific sources if(OS_LINUX)