Switch hard coded paths to GNUInstallDirs variables.

These directories may not be the same on all systems. Also, they can be set by a package manager. Signed-off by Jonathan Scruggs <j.scruggs@gmail.com>
wdas · Aug 27, 2017 · 2d25937 · 2d25937
1 parent 84c0714
commit 2d25937
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
@@ -46,5 +46,5 @@ IF(DOXYGEN_FOUND)
   add_custom_target(doc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxygen.txt)
   add_dependencies(doc DOCUMENTED_FILES)
 
-  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/partio )
+  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR} )
 ENDIF(DOXYGEN_FOUND)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -52,4 +52,4 @@ endif ()
 ENDIF(SEEXPR_BASE)
 
 FILE(GLOB public_includes "*.h")
-INSTALL (FILES ${public_includes} DESTINATION include)
+INSTALL (FILES ${public_includes} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -36,5 +36,5 @@ link_directories(${CMAKE_BINARY_DIR}/src/lib)
 foreach(item testiterator test testcache testclonecopy testcluster teststr makecircle makeline testkdtree)
     ADD_EXECUTABLE(${item} "${item}.cpp")
     target_link_libraries(${item} ${PARTIO_LIBRARIES})
-    install(TARGETS ${item} DESTINATION share/partio/test)
+    install(TARGETS ${item} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/partio/test)
 endforeach(item)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(GLUT_FOUND AND OPENGL_FOUND)
     INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
     ADD_EXECUTABLE(partview partview.cpp)
     target_link_libraries(partview ${PARTIO_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY})
-    install(TARGETS  partview DESTINATION bin)
+    install(TARGETS  partview DESTINATION ${CMAKE_INSTALL_BINDIR})
 ENDIF(GLUT_FOUND AND OPENGL_FOUND)
 
 ADD_EXECUTABLE(partinfo partinfo.cpp)
@@ -53,4 +53,4 @@ target_link_libraries(partconv ${PARTIO_LIBRARIES})
 ADD_EXECUTABLE(partattr partattr.cpp)
 target_link_libraries(partattr ${PARTIO_LIBRARIES})
 
-install(TARGETS partattr partconv partinfo DESTINATION bin)
+install(TARGETS partattr partconv partinfo DESTINATION ${CMAKE_INSTALL_BINDIR})