Generate config.h in builddir again, and fix compilation when compiling taglib alone

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@937935 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb48fdc2e6416e6be7323c47a9c1c991756455a8..fabee91f0368a4c4e78d2e7c74bab99139b51e88 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,8 @@ 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_SOURCE_DIR}/config.h )
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 ADD_SUBDIRECTORY( taglib ) 
 

diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index a3ea8530b6d5354d701b755cd6f69f0330141668..42f503ec1ea2cb792478b01e0cd25531a5f9ed84 100644 (file)
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif
 
 #include "tag_c.h"