Use GNUInstallDirs everywhere

CMakeLists.txt

@@ -78,10 +78,10 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 ## Set install location
-IF (NOT DEFINED CMAKE_INSTALL_PREFIX)
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
     SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
-ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 # Prefer libglvnd for OpenGL
 set(OpenGL_GL_PREFERENCE GLVND)

src/py/CMakeLists.txt

@@ -70,8 +70,8 @@ endif ()
 
 SET(PYTHON_DEST "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages" )
 INSTALL(TARGETS _partio DESTINATION ${PYTHON_DEST})
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${outdir}/py/partio.py  DESTINATION ${PYTHON_DEST})
-INSTALL(FILES partio.i DESTINATION share/partio/swig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${outdir}/py/partio.py DESTINATION ${PYTHON_DEST})
+INSTALL(FILES partio.i DESTINATION ${CMAKE_INSTALL_DATADIR}/partio/swig)
 
 ENDIF(PYTHONLIBS_FOUND)
 #ENDIF(SWIG_FOUND)

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 ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS partview DESTINATION ${CMAKE_INSTALL_BINDIR})
 ENDIF(GLUT_FOUND AND OPENGL_FOUND)
 
 ADD_EXECUTABLE(partinfo partinfo.cpp)