FLAC now depends on win_utf8_io

Accidently found this missing dependency

9 files changed, 22 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7dd2960..8f83b382 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ install(
     DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
 
 file(GLOB FLAC_HEADERS "include/FLAC/*.h")
-file(GLOB FLACXX_HEADERS "include/FLAC++/*.h")
+file(GLOB FLAC++_HEADERS "include/FLAC++/*.h")
 install(FILES ${FLAC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/FLAC")
-install(FILES ${FLACXX_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/FLAC++")
+install(FILES ${FLAC++_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/FLAC++")
 install(FILES "man/flac.1" "man/metaflac.1" DESTINATION "${CMAKE_INSTALL_MANDIR}")
diff --git a/examples/cpp/decode/file/CMakeLists.txt b/examples/cpp/decode/file/CMakeLists.txt
index 0cea828a..46ab401e 100644
--- a/examples/cpp/decode/file/CMakeLists.txt
+++ b/examples/cpp/decode/file/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(decode_file_cxx main.cpp)
-target_link_libraries(decode_file_cxx FLACXX-static)
+target_link_libraries(decode_file_cxx FLAC++-static)
diff --git a/examples/cpp/encode/file/CMakeLists.txt b/examples/cpp/encode/file/CMakeLists.txt
index b4526d71..cc117215 100644
--- a/examples/cpp/encode/file/CMakeLists.txt
+++ b/examples/cpp/encode/file/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(encode_file_cxx main.cpp)
-target_link_libraries(encode_file_cxx FLACXX-static)
+target_link_libraries(encode_file_cxx FLAC++-static)
diff --git a/src/libFLAC++/CMakeLists.txt b/src/libFLAC++/CMakeLists.txt
index f6d61107..e73ffcb1 100644
--- a/src/libFLAC++/CMakeLists.txt
+++ b/src/libFLAC++/CMakeLists.txt
@@ -25,25 +25,25 @@ set(SOURCES
     stream_decoder.cpp
     stream_encoder.cpp)
 
-add_library(FLACXX-static STATIC ${SOURCES})
-target_compile_definitions(FLACXX-static PUBLIC FLAC__NO_DLL)
-target_include_directories(FLACXX-static INTERFACE
+add_library(FLAC++-static STATIC ${SOURCES})
+target_compile_definitions(FLAC++-static PUBLIC FLAC__NO_DLL)
+target_include_directories(FLAC++-static INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>")
-target_link_libraries(FLACXX-static PUBLIC FLAC-static)
+target_link_libraries(FLAC++-static PUBLIC FLAC-static)
 
-add_library(FLACXX SHARED ${SOURCES})
-target_compile_definitions(FLACXX PRIVATE FLACPP_API_EXPORTS FLAC__USE_VISIBILITY_ATTR)
-target_include_directories(FLACXX INTERFACE
+add_library(FLAC++ SHARED ${SOURCES})
+target_compile_definitions(FLAC++ PRIVATE FLACPP_API_EXPORTS FLAC__USE_VISIBILITY_ATTR)
+target_include_directories(FLAC++ INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>")
-target_link_libraries(FLACXX PRIVATE FLAC)
-set_target_properties(FLACXX PROPERTIES
+target_link_libraries(FLAC++ PRIVATE FLAC)
+set_target_properties(FLAC++ PROPERTIES
     CXX_VISIBILITY_PRESET hidden
     VERSION 6.3.0
     SOVERSION 6)
 
-install(TARGETS FLACXX FLACXX-static EXPORT targets
+install(TARGETS FLAC++ FLAC++-static EXPORT targets
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/")
diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt
index 594b672c..17d940bd 100644
--- a/src/libFLAC/CMakeLists.txt
+++ b/src/libFLAC/CMakeLists.txt
@@ -107,15 +107,13 @@ target_include_directories(FLAC-static INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>")
 target_link_libraries(FLAC-static PUBLIC
-    $<TARGET_NAME_IF_EXISTS:Ogg::Ogg-static>
+    $<TARGET_NAME_IF_EXISTS:win_utf8_io>
     $<TARGET_NAME_IF_EXISTS:FLAC-asm>
     $<$<BOOL:${HAVE_LROUND}>:m>)
 if(TARGET Ogg::Ogg-static)
-    target_link_libraries(FLAC-static PUBLIC
-        $<TARGET_NAME_IF_EXISTS:Ogg::Ogg-static>)
+    target_link_libraries(FLAC-static PUBLIC Ogg::Ogg-static)
 elseif(TARGET Ogg::Ogg)
-    target_link_libraries(FLAC-static PUBLIC
-        $<TARGET_NAME_IF_EXISTS:Ogg::Ogg>)
+    target_link_libraries(FLAC-static PUBLIC Ogg::Ogg)
 endif()
 
 add_library(FLAC SHARED ${SOURCES})
@@ -126,6 +124,7 @@ target_include_directories(FLAC INTERFACE
 target_link_libraries(FLAC PRIVATE
     $<TARGET_NAME_IF_EXISTS:Ogg::Ogg>
     $<TARGET_NAME_IF_EXISTS:FLAC-asm>
+    $<TARGET_NAME_IF_EXISTS:win_utf8_io>
     $<$<BOOL:${HAVE_LROUND}>:m>)
 set_target_properties(FLAC PROPERTIES
     C_VISIBILITY_PRESET hidden
diff --git a/src/share/grabbag/CMakeLists.txt b/src/share/grabbag/CMakeLists.txt
index 6d405d05..a7ab1662 100644
--- a/src/share/grabbag/CMakeLists.txt
+++ b/src/share/grabbag/CMakeLists.txt
@@ -8,5 +8,4 @@ add_library(grabbag STATIC
     snprintf.c)
 target_link_libraries(grabbag
     FLAC-static
-    replaygain_analysis
-    $<TARGET_NAME_IF_EXISTS:win_utf8_io>)
+    replaygain_analysis)
diff --git a/src/test_libFLAC++/CMakeLists.txt b/src/test_libFLAC++/CMakeLists.txt
index 27f3cdb7..91d2a173 100644
--- a/src/test_libFLAC++/CMakeLists.txt
+++ b/src/test_libFLAC++/CMakeLists.txt
@@ -5,4 +5,4 @@ add_executable(test_libFLAC++
     metadata.cpp
     metadata_manip.cpp
     metadata_object.cpp)
-target_link_libraries(test_libFLAC++ FLACXX-static test_libs_common grabbag)
+target_link_libraries(test_libFLAC++ FLAC++-static test_libs_common grabbag)
diff --git a/src/utils/flacdiff/CMakeLists.txt b/src/utils/flacdiff/CMakeLists.txt
index d64383ff..7f1421ec 100644
--- a/src/utils/flacdiff/CMakeLists.txt
+++ b/src/utils/flacdiff/CMakeLists.txt
@@ -1,4 +1,2 @@
 add_executable(flacdiff main.cpp)
-target_link_libraries(flacdiff 
-    FLACXX-static
-    $<TARGET_NAME_IF_EXISTS:win_utf8_io>)
\ No newline at end of file
+target_link_libraries(flacdiff FLAC++-static)
diff --git a/src/utils/flactimer/CMakeLists.txt b/src/utils/flactimer/CMakeLists.txt
index d40de89c..40db1cf1 100644
--- a/src/utils/flactimer/CMakeLists.txt
+++ b/src/utils/flactimer/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(flactimer main.cpp)
-target_link_libraries(flactimer FLACXX-static)
+target_link_libraries(flactimer FLAC++-static)