diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-11-20 21:24:07 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-11-20 21:24:07 +0000 |
| commit | 3cd59e39ab2cf25aaab5c96fa261a94e78942a35 (patch) | |
| tree | bb2a4b6edaf5f3321b0cbb2308a46d85a5e44f93 /src | |
| parent | a210178c96d5c333938b49916c9d217c024a6b93 (diff) | |
| download | qmmp-3cd59e39ab2cf25aaab5c96fa261a94e78942a35.tar.gz qmmp-3cd59e39ab2cf25aaab5c96fa261a94e78942a35.tar.bz2 qmmp-3cd59e39ab2cf25aaab5c96fa261a94e78942a35.zip | |
cmake: using GNUInstallDirs module
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8459 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/plugins/General/kdenotify/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/qmmp/qmmp.pc.in | 2 | ||||
| -rw-r--r-- | src/qmmpui/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/qmmpui/qmmpui.pc.in | 2 |
7 files changed, 31 insertions, 31 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index f752e2483..bebe9779d 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -35,15 +35,15 @@ target_link_libraries(qmmp Qt5::Widgets libqmmp libqmmpui) SET_TARGET_PROPERTIES(qmmp PROPERTIES OUTPUT_NAME qmmp${APP_NAME_SUFFIX}) add_dependencies(qmmp libqmmpui libqmmp) -install(TARGETS qmmp DESTINATION bin) -install(FILES qmmp.desktop DESTINATION share/applications) -install(FILES qmmp${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) -install(FILES images/16x16/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/16x16/apps) -install(FILES images/32x32/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/32x32/apps) -install(FILES images/48x48/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/48x48/apps) -install(FILES images/scalable/qmmp${APP_NAME_SUFFIX}.svgz images/scalable/qmmp-simple${APP_NAME_SUFFIX}.svgz DESTINATION share/icons/hicolor/scalable/apps) +install(TARGETS qmmp DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(FILES qmmp.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) +install(FILES qmmp${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) +install(FILES images/16x16/qmmp${APP_NAME_SUFFIX}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps) +install(FILES images/32x32/qmmp${APP_NAME_SUFFIX}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps) +install(FILES images/48x48/qmmp${APP_NAME_SUFFIX}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps) +install(FILES images/scalable/qmmp${APP_NAME_SUFFIX}.svgz images/scalable/qmmp-simple${APP_NAME_SUFFIX}.svgz DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) IF(USE_DIR_ASSOC) - install(FILES qmmp-enqueue${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) - install(FILES qmmp-dir${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) + install(FILES qmmp-enqueue${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + install(FILES qmmp-dir${APP_NAME_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) ENDIF(USE_DIR_ASSOC) diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index c61cb35cc..7aa9e20df 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -36,5 +36,5 @@ SET_TARGET_PROPERTIES(kdenotify PROPERTIES COMPILE_DEFINITIONS "${libkdenotify_D add_dependencies(kdenotify libqmmpui) target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS kdenotify DESTINATION ${PLUGIN_DIR}/General) -install(FILES images/empty_cover.png DESTINATION share/qmmp${APP_NAME_SUFFIX}/images) -install(FILES images/app_icon.png DESTINATION share/qmmp${APP_NAME_SUFFIX}/images) +install(FILES images/empty_cover.png DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/images) +install(FILES images/app_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/images) diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index 176d8c198..fe0756103 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -103,5 +103,5 @@ SET_TARGET_PROPERTIES(skinned PROPERTIES COMPILE_DEFINITIONS "${libskinned_DEFIN add_dependencies(skinned libqmmpui libqmmp) target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS}) install(TARGETS skinned DESTINATION ${PLUGIN_DIR}/Ui) -install(FILES scripts/kwin.sh DESTINATION share/qmmp${APP_NAME_SUFFIX}/scripts) +install(FILES scripts/kwin.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/scripts) ENDIF(X11_FOUND) diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 3e868ce18..0c5fb1cc6 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -135,18 +135,17 @@ ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_HDRS}) target_link_libraries(libqmmp Qt5::Widgets) SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp${APP_NAME_SUFFIX}) target_compile_definitions(libqmmp PRIVATE ${libqmmp_DEFINES}) -install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION ${LIB_DIR}) -install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) +install(TARGETS libqmmp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) IF(APP_NAME_SUFFIX) - install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp${APP_NAME_SUFFIX}/qmmp) - SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/qmmp${APP_NAME_SUFFIX}) + install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}/qmmp) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/qmmp${APP_NAME_SUFFIX}) ELSE() - install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) - SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) + install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qmmp) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ENDIF() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc DESTINATION ${LIB_DIR}/pkgconfig) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/qmmp/qmmp.pc.in b/src/qmmp/qmmp.pc.in index be11ca7e3..ae8e1af12 100644 --- a/src/qmmp/qmmp.pc.in +++ b/src/qmmp/qmmp.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: qmmp@APP_NAME_SUFFIX@ 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@ |
