From 3ec42c7b84f6fe9a329c016ba70e3a678f4e624f Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 9 Mar 2009 22:20:50 +0000 Subject: [PATCH] Re-add building things depending on config.h by having it generate in the source tree instead of the build tree, so that when cmake uses a non-source build dir (as it's supposed to) it can actually find the file. I think this is messy, as AFAIK cmake shouldn't be modifying the contents of the source tree...any cmake gurus out there, feel free to let me know if there's a better way. git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f99d22b4..bb48fdc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ OPTION(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF) OPTION(WITH_ASF "Enable ASF tag reading/writing code" OFF) OPTION(WITH_MP4 "Enable MP4 tag reading/writing code" OFF) -#add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DHAVE_CONFIG_H) #add some KDE specific stuff set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) @@ -45,7 +45,7 @@ include(ConfigureChecks.cmake) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc ) -configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) +configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h ) ADD_SUBDIRECTORY( taglib )