Fix pkgconfig file generation after merge from master

FluidSynth · Dec 20, 2021 · d9f95b7 · d9f95b7
1 parent cfc5d72
commit d9f95b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -836,11 +836,6 @@ endif ()
 
 generate_pkgconfig_spec(fluidsynth.pc.in ${CMAKE_BINARY_DIR}/fluidsynth.pc libfluidsynth-OBJ)
 
-configure_file ( fluidsynth.pc.in
-	${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY )
-install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc
-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-
 # Exported targets for cmake: find_package(FluidSynth)
 # when installed, use CMAKE_PREFIX_PATH=fluidsynth-prefix;...
 # to use the build directory directly set the FluidSynth_DIR variable instead.

diff --git a/cmake_admin/PkgConfigHelpers.cmake b/cmake_admin/PkgConfigHelpers.cmake
@@ -57,6 +57,8 @@ macro ( generate_pkgconfig_spec template outfile target )
         list ( TRANSFORM LIBS_PRIVATE PREPEND "-l")
         list ( JOIN LIBS_PRIVATE " " LIBS_PRIVATE_JOINED )
         list ( JOIN LIBS_PRIVATE_WITH_PATH " " LIBS_PRIVATE_WITH_PATH_JOINED )
+
+        list ( JOIN PC_REQUIRES_PRIV " " PC_REQUIRES_PRIV_JOINED )
 
         configure_file ( ${template} ${outfile} IMMEDIATE @ONLY)
     endif()