Fix for using Taglib as a CMake sub directory project.

diff --git a/cmake/modules/TestFloatFormat.cmake b/cmake/modules/TestFloatFormat.cmake
index c1bc568f811fbc8874aa9e2cc8de2c783cd2bcc0..ef9b18606784d53217c3cc0af7f22e1b7a866cdd 100644 (file)
--- a/cmake/modules/TestFloatFormat.cmake
+++ b/cmake/modules/TestFloatFormat.cmake
@@ -3,7 +3,7 @@
 MACRO(TEST_FLOAT_FORMAT FP_IEEE754)
   IF(NOT FP_IEEE754)
     TRY_COMPILE(HAVE_FLOAT_FORMAT_BIN
-      "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/cmake/TestFloatFormat.c"
+      "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/TestFloatFormat.c"
     COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestFloatFormat.bin")
 
     SET(FP_IEEE754 0)

diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 33a0030bf2b9091e21dfc6ddcb4cdd2a5d5f7d17..73c1a2f8a8835ae59e2b3318ea83a2c8b8f3cbce 100644 (file)
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -37,7 +37,7 @@ set(tag_HDRS
   fileref.h
   audioproperties.h
   taglib_export.h
-  ${CMAKE_BINARY_DIR}/taglib_config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h
   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h