[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2009-03-09 22:20:51
Message-ID: 1236637251.281294.18145.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 937552 by mitchell:

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.


 M  +2 -2      CMakeLists.txt  


--- trunk/kdesupport/taglib/CMakeLists.txt #937551:937552
@@ -9,7 +9,7 @@
 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 @@
 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 ) 
 


[prev in list] [next in list] [prev in thread] [next in thread]