Use the PUBLIC_HEADER property to prepare for building an OS X framework

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233f05eb3a562fbf221fe32c1ebc14602f54d2cf..88894c36ca0e4f909131c3b7f8cc02f6eb51e82e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,6 @@ if(WITH_MP4)
 endif()
 
 configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
 
 add_subdirectory(taglib) 
 add_subdirectory(bindings)

diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
index d1f75234aea11ef26003b717634627ceeecd1689..e9c8843f35e56602407bebbc3020bf3c4e9155c7 100644 (file)
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -18,6 +18,8 @@ include_directories(
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc)
 
+set(tag_c_HDRS tag_c.h)
+
 if(ENABLE_STATIC)
   add_library(tag_c STATIC tag_c.cpp)
   set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
@@ -26,6 +28,7 @@ else()
 endif()
 
 target_link_libraries(tag_c tag)
+set_target_properties(tag_c PROPERTIES PUBLIC_HEADER "${tag_c_HDRS}")
 
 # On Solaris we need to explicitly add the C++ standard and runtime
 # libraries to the libs used by the C bindings, because those C bindings
@@ -58,8 +61,8 @@ install(TARGETS tag_c
        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+       PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-install(FILES tag_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
 

diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 53022c0aede532b40bce8278662a92a581d393f6..bd8effc3d66c75c51c12c9d32a96a8f1921b76fe 100644 (file)
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -25,17 +25,95 @@ if(ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIR})
 endif()
 
-add_subdirectory(toolkit)
-add_subdirectory(asf)
-add_subdirectory(mpeg)
-add_subdirectory(ogg)
-add_subdirectory(flac)
-add_subdirectory(ape)
-add_subdirectory(mpc)
-add_subdirectory(mp4)
-add_subdirectory(wavpack)
-add_subdirectory(trueaudio)
-add_subdirectory(riff)
+set(tag_HDRS
+  tag.h
+  fileref.h
+  audioproperties.h
+  taglib_export.h
+  ${CMAKE_BINARY_DIR}/taglib_config.h
+  toolkit/taglib.h
+  toolkit/tstring.h
+  toolkit/tlist.h
+  toolkit/tlist.tcc
+  toolkit/tstringlist.h
+  toolkit/tbytevector.h
+  toolkit/tbytevectorlist.h
+  toolkit/tfile.h
+  toolkit/tmap.h
+  toolkit/tmap.tcc
+  mpeg/mpegfile.h
+  mpeg/mpegproperties.h
+  mpeg/mpegheader.h
+  mpeg/xingheader.h
+  mpeg/id3v1/id3v1tag.h
+  mpeg/id3v1/id3v1genres.h
+  mpeg/id3v2/id3v2extendedheader.h
+  mpeg/id3v2/id3v2frame.h
+  mpeg/id3v2/id3v2header.h
+  mpeg/id3v2/id3v2synchdata.h
+  mpeg/id3v2/id3v2footer.h
+  mpeg/id3v2/id3v2framefactory.h
+  mpeg/id3v2/id3v2tag.h
+  mpeg/id3v2/frames/attachedpictureframe.h
+  mpeg/id3v2/frames/commentsframe.h
+  mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+  mpeg/id3v2/frames/popularimeterframe.h
+  mpeg/id3v2/frames/privateframe.h
+  mpeg/id3v2/frames/relativevolumeframe.h
+  mpeg/id3v2/frames/textidentificationframe.h
+  mpeg/id3v2/frames/uniquefileidentifierframe.h
+  mpeg/id3v2/frames/unknownframe.h
+  mpeg/id3v2/frames/unsynchronizedlyricsframe.h
+  mpeg/id3v2/frames/urllinkframe.h
+  ogg/oggfile.h
+  ogg/oggpage.h
+  ogg/oggpageheader.h
+  ogg/xiphcomment.h
+  ogg/vorbis/vorbisfile.h
+  ogg/vorbis/vorbisproperties.h
+  ogg/flac/oggflacfile.h
+  ogg/speex/speexfile.h
+  ogg/speex/speexproperties.h
+  flac/flacfile.h
+  flac/flacpicture.h
+  flac/flacproperties.h
+  flac/flacmetadatablock.h
+  ape/apefile.h
+  ape/apeproperties.h
+  ape/apetag.h
+  ape/apefooter.h
+  ape/apeitem.h
+  mpc/mpcfile.h
+  mpc/mpcproperties.h
+  wavpack/wavpackfile.h
+  wavpack/wavpackproperties.h
+  trueaudio/trueaudiofile.h
+  trueaudio/trueaudioproperties.h
+  riff/rifffile.h
+  riff/aiff/aifffile.h
+  riff/aiff/aiffproperties.h
+  riff/wav/wavfile.h
+  riff/wav/wavproperties.h
+)
+if(WITH_ASF)
+  set(tag_HDRS ${tag_HDRS}
+    asf/asffile.h
+    asf/asfproperties.h
+    asf/asftag.h
+    asf/asfattribute.h
+    asf/asfpicture.h
+  )
+endif()
+if(WITH_MP4)
+  set(tag_HDRS ${tag_HDRS}
+    mp4/mp4file.h
+    mp4/mp4atom.h
+    mp4/mp4tag.h
+    mp4/mp4item.h
+    mp4/mp4properties.h
+    mp4/mp4coverart.h
+  )
+endif()
 
 set(mpeg_SRCS
   mpeg/mpegfile.cpp
@@ -199,13 +277,13 @@ set_target_properties(tag PROPERTIES
   INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
   DEFINE_SYMBOL MAKE_TAGLIB_LIB
   LINK_INTERFACE_LIBRARIES ""
+  PUBLIC_HEADER "${tag_HDRS}"
 )
 
 install(TARGETS tag
        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+       PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )
 
-install(FILES tag.h fileref.h audioproperties.h taglib_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
-

diff --git a/taglib/ape/CMakeLists.txt b/taglib/ape/CMakeLists.txt
deleted file mode 100644 (file)
index 1a3c209..0000000
--- a/taglib/ape/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES apefile.h apeproperties.h apetag.h apefooter.h apeitem.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/asf/CMakeLists.txt b/taglib/asf/CMakeLists.txt
deleted file mode 100644 (file)
index 2855bec..0000000
--- a/taglib/asf/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  asffile.h asfproperties.h asftag.h asfattribute.h asfpicture.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/flac/CMakeLists.txt b/taglib/flac/CMakeLists.txt
deleted file mode 100644 (file)
index 588208f..0000000
--- a/taglib/flac/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  flacfile.h flacpicture.h flacproperties.h flacmetadatablock.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib )

diff --git a/taglib/mp4/CMakeLists.txt b/taglib/mp4/CMakeLists.txt
deleted file mode 100644 (file)
index 993a5c0..0000000
--- a/taglib/mp4/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  mp4file.h mp4atom.h mp4tag.h mp4item.h mp4properties.h mp4coverart.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/mpc/CMakeLists.txt b/taglib/mpc/CMakeLists.txt
deleted file mode 100644 (file)
index 238c9cb..0000000
--- a/taglib/mpc/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  mpcfile.h mpcproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/mpeg/CMakeLists.txt b/taglib/mpeg/CMakeLists.txt
deleted file mode 100644 (file)
index 9b0e308..0000000
--- a/taglib/mpeg/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ADD_SUBDIRECTORY( id3v1 ) 
-ADD_SUBDIRECTORY( id3v2 ) 
-
-INSTALL(FILES  mpegfile.h mpegproperties.h mpegheader.h xingheader.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib )

diff --git a/taglib/mpeg/id3v1/CMakeLists.txt b/taglib/mpeg/id3v1/CMakeLists.txt
deleted file mode 100644 (file)
index 64b21ec..0000000
--- a/taglib/mpeg/id3v1/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  id3v1tag.h id3v1genres.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/mpeg/id3v2/CMakeLists.txt b/taglib/mpeg/id3v2/CMakeLists.txt
deleted file mode 100644 (file)
index f6e1ef1..0000000
--- a/taglib/mpeg/id3v2/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ADD_SUBDIRECTORY( frames ) 
-
-INSTALL(FILES  id3v2extendedheader.h id3v2frame.h id3v2header.h        id3v2synchdata.h id3v2footer.h id3v2framefactory.h id3v2tag.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
-

diff --git a/taglib/mpeg/id3v2/frames/CMakeLists.txt b/taglib/mpeg/id3v2/frames/CMakeLists.txt
deleted file mode 100644 (file)
index 6636dde..0000000
--- a/taglib/mpeg/id3v2/frames/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-INSTALL(FILES
-       attachedpictureframe.h
-       commentsframe.h
-       generalencapsulatedobjectframe.h
-       popularimeterframe.h
-       privateframe.h
-       relativevolumeframe.h
-       textidentificationframe.h
-       uniquefileidentifierframe.h
-       unknownframe.h
-       unsynchronizedlyricsframe.h
-       urllinkframe.h
-       DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/ogg/CMakeLists.txt b/taglib/ogg/CMakeLists.txt
deleted file mode 100644 (file)
index d506a3c..0000000
--- a/taglib/ogg/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ADD_SUBDIRECTORY( vorbis ) 
-ADD_SUBDIRECTORY( speex ) 
-ADD_SUBDIRECTORY( flac ) 
-
-INSTALL( FILES  oggfile.h      oggpage.h       oggpageheader.h         xiphcomment.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib )
-

diff --git a/taglib/ogg/flac/CMakeLists.txt b/taglib/ogg/flac/CMakeLists.txt
deleted file mode 100644 (file)
index 6e7d9a8..0000000
--- a/taglib/ogg/flac/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-INSTALL( FILES  oggflacfile.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
-

diff --git a/taglib/ogg/speex/CMakeLists.txt b/taglib/ogg/speex/CMakeLists.txt
deleted file mode 100644 (file)
index 7f35b71..0000000
--- a/taglib/ogg/speex/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  speexfile.h speexproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/ogg/vorbis/CMakeLists.txt b/taglib/ogg/vorbis/CMakeLists.txt
deleted file mode 100644 (file)
index 7033e13..0000000
--- a/taglib/ogg/vorbis/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  vorbisfile.h vorbisproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/riff/CMakeLists.txt b/taglib/riff/CMakeLists.txt
deleted file mode 100644 (file)
index f691ee4..0000000
--- a/taglib/riff/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ADD_SUBDIRECTORY( aiff )
-ADD_SUBDIRECTORY( wav )
-
-INSTALL( FILES  rifffile.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/riff/aiff/CMakeLists.txt b/taglib/riff/aiff/CMakeLists.txt
deleted file mode 100644 (file)
index 7e8cdd6..0000000
--- a/taglib/riff/aiff/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  aifffile.h aiffproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/riff/wav/CMakeLists.txt b/taglib/riff/wav/CMakeLists.txt
deleted file mode 100644 (file)
index c011579..0000000
--- a/taglib/riff/wav/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  wavfile.h wavproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/toolkit/CMakeLists.txt b/taglib/toolkit/CMakeLists.txt
deleted file mode 100644 (file)
index 2e39d31..0000000
--- a/taglib/toolkit/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  taglib.h tstring.h tlist.h tlist.tcc tstringlist.h     tbytevector.h tbytevectorlist.h tfile.h         tmap.h tmap.tcc DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp
index 946d7ea26329973578a2b0bb0fe0a5c169dd241e..93879f10cdfba20efd4afc65feab8a1d2a9f2f6e 100644 (file)
--- a/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@ -564,3 +564,4 @@ TagLib::uint File::bufferSize()
 {
   return FilePrivate::bufferSize;
 }
+

diff --git a/taglib/trueaudio/CMakeLists.txt b/taglib/trueaudio/CMakeLists.txt
deleted file mode 100644 (file)
index 3a1c3e7..0000000
--- a/taglib/trueaudio/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  trueaudiofile.h trueaudioproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

diff --git a/taglib/wavpack/CMakeLists.txt b/taglib/wavpack/CMakeLists.txt
deleted file mode 100644 (file)
index 8b9de0f..0000000
--- a/taglib/wavpack/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL( FILES  wavpackfile.h wavpackproperties.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)