Include CNUInstallDirs for correct install paths

lancos · Mar 30, 2018 · 08be7df · 08be7df
1 parent d0dea68
commit 08be7df
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt
@@ -5,53 +5,55 @@ SET(CPACK_SET_DESTDIR "ON")
 SET(CPACK_INSTALL_PREFIX "/usr") 
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
 
+INCLUDE(GNUInstallDirs)
+
 MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
 
 # SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" )
 SET( CPACK_PACKAGE_LICENSE "${PONYPROG_CPACK_PACKAGE_LICENSE}" )
 SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
 # SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
 
-INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" 
-        DESTINATION "bin/" 
-        COMPONENT "application" 
+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
+        DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        COMPONENT "application"
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         )
 
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"    
-        DESTINATION "share/icons/" 
-        COMPONENT "application" 
-        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
+        COMPONENT "application"
+        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         FILES_MATCHING PATTERN "*.png"
         )
 
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/" 
-        DESTINATION "share/ponyprog/lang/" 
-        COMPONENT "lang files" 
-        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang/"
+        COMPONENT "lang files"
+        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         FILES_MATCHING PATTERN "*.utf"
-        ) 
+        )
 
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/" 
-        DESTINATION "share/doc/ponyprog/" 
+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
         COMPONENT "help files" 
-        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
+        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html"
-        ) 
+        )
 
-INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright" 
-        DESTINATION "share/doc/ponyprog/" 
-        COMPONENT "application" 
+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+        COMPONENT "application"
         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
         ) 
 # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
 
 INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop"
-        DESTINATION "share/applications/" 
-        COMPONENT "application" 
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/"
+        COMPONENT "application"
         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
         )
-        
+
 SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}")
 
 SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}")