From d9f95b77d4d89d80e1bb0c48a6d0b51e61f3340a Mon Sep 17 00:00:00 2001 From: derselbst Date: Mon, 20 Dec 2021 16:10:51 +0100 Subject: [PATCH] Fix pkgconfig file generation after merge from master --- CMakeLists.txt | 5 ----- cmake_admin/PkgConfigHelpers.cmake | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 347fd241..4eb837f6 100644 --- 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 index 8de603a4..4fa0655e 100644 --- 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()