From 05e77303bf103dd3319d74882090e0ca42c768b6 Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Fri, 16 Dec 2016 21:33:44 +0100 Subject: [PATCH] - Game-Music-Emu: Merge commit 12b50ee. Commit title: Honor LIB_SUFFIX with pkg-config metadata. --- game-music-emu/changes.txt | 6 ++++++ game-music-emu/gme/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/game-music-emu/changes.txt b/game-music-emu/changes.txt index 62391ebb5..dfab7a9c0 100644 --- a/game-music-emu/changes.txt +++ b/game-music-emu/changes.txt @@ -1,6 +1,12 @@ Game_Music_Emu Change Log ------------------------- +Game_Music_Emu 0.6.1 +-------------------- + +- Packaging improvements: + - Honor $LIB_SUFFIX for installed pkg-config metadata. + Game_Music_Emu 0.6.0 -------------------- diff --git a/game-music-emu/gme/CMakeLists.txt b/game-music-emu/gme/CMakeLists.txt index d10ed2920..8d710709f 100644 --- a/game-music-emu/gme/CMakeLists.txt +++ b/game-music-emu/gme/CMakeLists.txt @@ -164,7 +164,7 @@ install(TARGETS gme LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib) # DLL platforms install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib/pkgconfig) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) endif() target_link_libraries(gme)