From 3cd59e39ab2cf25aaab5c96fa261a94e78942a35 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 20 Nov 2018 21:24:07 +0000 Subject: cmake: using GNUInstallDirs module git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8459 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/CMakeLists.txt | 17 +++++++++-------- src/qmmpui/qmmpui.pc.in | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/qmmpui') diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index 87e2d5b9a..164d2e8df 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -138,17 +138,18 @@ target_link_libraries(libqmmpui Qt5::Widgets Qt5::Network libqmmp) add_dependencies(libqmmpui libqmmp) SET_TARGET_PROPERTIES(libqmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmpui${APP_NAME_SUFFIX}) SET_TARGET_PROPERTIES(libqmmpui PROPERTIES COMPILE_DEFINITIONS "${libqmmpui_DEFINES}") -install(TARGETS libqmmpui LIBRARY DESTINATION ${LIB_DIR} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION ${LIB_DIR}) +install(TARGETS libqmmpui LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) IF(APP_NAME_SUFFIX) - install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmp${APP_NAME_SUFFIX}/qmmpui) - SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/qmmp${APP_NAME_SUFFIX}) + install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmpui) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}) ELSE() - install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) - SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) + install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmpui) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ENDIF() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc DESTINATION ${LIB_DIR}/pkgconfig) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/qmmpui/qmmpui.pc.in b/src/qmmpui/qmmpui.pc.in index af1902f71..f4e9e4d0e 100644 --- a/src/qmmpui/qmmpui.pc.in +++ b/src/qmmpui/qmmpui.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_PREFIX@/@LIB_DIR@ +libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ includedir=@QMMP_INCLUDE_DIR@ Name: qmmpui@APP_NAME_SUFFIX@ -- cgit v1.2.3-13-gbd6f