CMake: Rely on GNUInstallDirs to specify install paths

This makes multiarch OSes happy as they can dictate that
64-bit libraries go into 'lib64'

CMakeLists.txt

@@ -29,6 +29,9 @@ if(CMAKE_VERSION VERSION_GREATER "3.8")
   set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME OFF)
 endif()
 
+# Include modules builtin to CMake
+include(GNUInstallDirs)     # Defines CMAKE_INSTALL_<dir> variables
+
 # Include global modules needed for configure scripts
 include(PackageConfig)      # Defines package_option
 
@@ -104,7 +107,7 @@ if(BUILD_MODELS)
                      COMMENT "Copying dmodels' assets")
 
   install(DIRECTORY "${PANDA_OUTPUT_DIR}/models"
-    COMPONENT Models DESTINATION share/panda3d)
+    COMPONENT Models DESTINATION ${CMAKE_INSTALL_DATADIR}/panda3d)
 endif()
 
 if(INTERROGATE_PYTHON_INTERFACE)
@@ -123,7 +126,7 @@ endif()
 file(COPY "${PROJECT_SOURCE_DIR}/cmake/install/Panda3DConfig.cmake"
   DESTINATION "${PROJECT_BINARY_DIR}")
 install(FILES "${PROJECT_SOURCE_DIR}/cmake/install/Panda3DConfig.cmake"
-  DESTINATION "lib/cmake/Panda3D")
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Panda3D")
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
@@ -131,7 +134,7 @@ write_basic_package_version_file(
   VERSION "${PROJECT_VERSION}"
   COMPATIBILITY AnyNewerVersion)
 install(FILES "${PROJECT_BINARY_DIR}/Panda3DConfigVersion.cmake"
-  DESTINATION "lib/cmake/Panda3D")
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Panda3D")
 
 if(NOT CMAKE_CROSSCOMPILING)
   export(PACKAGE Panda3D)

cmake/macros/BuildMetalib.cmake

@@ -411,7 +411,7 @@ function(add_metalib target_name)
 
     configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/metalib_init.h.in"
       "${init_header_path}")
-    install(FILES "${init_header_path}" DESTINATION include/panda3d)
+    install(FILES "${init_header_path}" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
   endif()
 
   add_library("${target_name}" ${sources})
@@ -421,6 +421,6 @@ function(add_metalib target_name)
   target_link_libraries("${target_name}" ${libs})
   target_include_directories("${target_name}"
     PUBLIC ${includes}
-    INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/panda3d>")
+    INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/panda3d>")
 
 endfunction(add_metalib)

cmake/macros/PackageConfig.cmake

@@ -457,7 +457,7 @@ function(export_targets set)
     FILE "${PROJECT_BINARY_DIR}/Panda3D${set}Targets.cmake")
   install(EXPORT "${set}" NAMESPACE "${namespace}"
     FILE "Panda3D${set}Targets.cmake"
-    COMPONENT "${component}" DESTINATION lib/cmake/Panda3D)
+    COMPONENT "${component}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Panda3D)
 
 endfunction(export_targets)
 

cmake/macros/Python.cmake

@@ -75,7 +75,7 @@ function(add_python_target target)
       OUTPUT_NAME "${basename}"
       PREFIX "libpy.${namespace}.")
 
-    install(TARGETS ${target} EXPORT "${export}" COMPONENT "${component}" DESTINATION lib)
+    install(TARGETS ${target} EXPORT "${export}" COMPONENT "${component}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
   endif()
 

contrib/src/ai/CMakeLists.txt

@@ -47,8 +47,8 @@ target_interrogate(p3ai ALL)
 
 install(TARGETS p3ai
   EXPORT Contrib COMPONENT Contrib
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT ContribDevel)
-install(FILES ${P3AI_HEADERS} COMPONENT ContribDevel DESTINATION include/panda3d)
+install(FILES ${P3AI_HEADERS} COMPONENT ContribDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

contrib/src/contribbase/CMakeLists.txt

@@ -11,4 +11,4 @@ add_library(p3contribbase INTERFACE)
 target_link_libraries(p3contribbase INTERFACE panda)
 
 install(TARGETS p3contribbase EXPORT Contrib COMPONENT Contrib)
-install(FILES ${P3CONTRIBBASE_HEADERS} COMPONENT ContribDevel DESTINATION include/panda3d)
+install(FILES ${P3CONTRIBBASE_HEADERS} COMPONENT ContribDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

contrib/src/rplight/CMakeLists.txt

@@ -45,8 +45,8 @@ endif()
 
 install(TARGETS p3rplight
   EXPORT Contrib COMPONENT Contrib
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT ContribDevel)
-install(FILES ${P3RPLIGHT_HEADERS} COMPONENT ContribDevel DESTINATION include/panda3d)
+install(FILES ${P3RPLIGHT_HEADERS} COMPONENT ContribDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/CMakeLists.txt

@@ -30,8 +30,8 @@ set_property(TARGET p3direct PROPERTY LINKER_LANGUAGE "CXX")
 # Installation:
 install(TARGETS p3direct
   EXPORT Direct COMPONENT Direct
-  DESTINATION lib
-  RUNTIME DESTINATION bin
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   ARCHIVE COMPONENT DirectDevel)
 
 if(HAVE_PYTHON)

direct/src/dcparse/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_executable(p3dcparse dcparse.cxx)
 target_link_libraries(p3dcparse p3direct)
-install(TARGETS p3dcparse EXPORT Direct COMPONENT Direct DESTINATION bin)
+install(TARGETS p3dcparse EXPORT Direct COMPONENT Direct DESTINATION ${CMAKE_INSTALL_BINDIR})

direct/src/dcparser/CMakeLists.txt

@@ -79,9 +79,9 @@ target_interrogate(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES}
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dcparser
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3DCPARSER_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3DCPARSER_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/deadrec/CMakeLists.txt

@@ -16,9 +16,9 @@ target_interrogate(p3deadrec ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3deadrec
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3DEADREC_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3DEADREC_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/directbase/CMakeLists.txt

@@ -11,4 +11,4 @@ add_library(p3directbase INTERFACE)
 target_link_libraries(p3directbase INTERFACE panda)
 
 install(TARGETS p3directbase EXPORT Direct COMPONENT Direct)
-install(FILES ${P3DIRECTBASE_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3DIRECTBASE_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/distributed/CMakeLists.txt

@@ -27,9 +27,9 @@ target_interrogate(p3distributed ALL EXTENSIONS ${P3DISTRIBUTED_IGATEEXT})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3distributed
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3DISTRIBUTED_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3DISTRIBUTED_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/interval/CMakeLists.txt

@@ -46,9 +46,9 @@ target_interrogate(p3interval ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3interval
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3INTERVAL_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3INTERVAL_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/motiontrail/CMakeLists.txt

@@ -16,9 +16,9 @@ target_interrogate(p3motiontrail ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3motiontrail
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3MOTIONTRAIL_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3MOTIONTRAIL_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

direct/src/showbase/CMakeLists.txt

@@ -19,9 +19,9 @@ target_interrogate(p3showbase ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3showbase
     EXPORT Direct COMPONENT Direct
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DirectDevel)
 endif()
-install(FILES ${P3SHOWBASE_HEADERS} COMPONENT DirectDevel DESTINATION include/panda3d)
+install(FILES ${P3SHOWBASE_HEADERS} COMPONENT DirectDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

dtool/CompilerFlags.cmake

@@ -44,7 +44,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PANDA_OUTPUT_DIR}/bin")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PANDA_OUTPUT_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PANDA_OUTPUT_DIR}/lib")
 
-set(MODULE_DESTINATION "lib")
+set(MODULE_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 
 # Runtime code assumes that dynamic modules have a "lib" prefix; Windows
 # assumes that debug libraries have a _d suffix.

dtool/LocalSetup.cmake

@@ -211,10 +211,10 @@ endif()
 
 install(FILES "${PANDA_OUTPUT_DIR}/include/dtool_config.h"
   COMPONENT CoreDevel
-  DESTINATION include/panda3d)
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 # Generate the package configuration file
 export_packages("${PROJECT_BINARY_DIR}/Panda3DPackages.cmake")
 install(FILES "${PROJECT_BINARY_DIR}/Panda3DPackages.cmake"
   COMPONENT CoreDevel
-  DESTINATION "lib/cmake/Panda3D")
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Panda3D")

dtool/metalibs/dtool/CMakeLists.txt

@@ -4,7 +4,7 @@ unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
 
 install(TARGETS p3dtool
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)

dtool/metalibs/dtoolconfig/CMakeLists.txt

@@ -5,7 +5,7 @@ unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
 
 install(TARGETS p3dtoolconfig
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)

dtool/src/cppparser/CMakeLists.txt

@@ -41,4 +41,4 @@ composite_sources(p3cppParser P3CPPPARSER_SOURCES)
 add_library(p3cppParser STATIC ${P3CPPPARSER_HEADERS} ${P3CPPPARSER_SOURCES})
 target_link_libraries(p3cppParser p3dtool)
 
-install(TARGETS p3cppParser EXPORT Core COMPONENT CoreDevel DESTINATION lib)
+install(TARGETS p3cppParser EXPORT Core COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_LIBDIR})

dtool/src/dconfig/CMakeLists.txt

@@ -2,5 +2,5 @@
 # We're only doing this to put the .h file on the path.
 add_library(p3dconfig INTERFACE)
 
-install(FILES dconfig.h COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES dconfig.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 install(TARGETS p3dconfig EXPORT Core COMPONENT Core)

dtool/src/dtoolbase/CMakeLists.txt

@@ -98,9 +98,9 @@ target_interrogate(p3dtoolbase ${P3DTOOLBASE_SOURCES} EXTENSIONS ${P3DTOOLBASE_I
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dtoolbase
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DTOOLBASE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DTOOLBASE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

dtool/src/dtoolutil/CMakeLists.txt

@@ -145,9 +145,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dtoolutil
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DTOOLUTIL_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DTOOLUTIL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

dtool/src/interrogate/CMakeLists.txt

@@ -85,8 +85,8 @@ if(NOT CMAKE_CROSSCOMPILING)
 endif()
 
 if(WANT_INTERROGATE)
-  install(TARGETS interrogate interrogate_module EXPORT Core COMPONENT CoreDevel DESTINATION bin)
-  install(FILES ${INTERROGATE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+  install(TARGETS interrogate interrogate_module EXPORT Core COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_BINDIR})
+  install(FILES ${INTERROGATE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 else()
   set_target_properties(interrogate interrogate_module

dtool/src/interrogatedb/CMakeLists.txt

@@ -41,13 +41,13 @@ target_link_libraries(p3interrogatedb p3prc p3dconfig p3dtool)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3interrogatedb
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3INTERROGATEDB_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
-install(FILES ${P3IGATERUNTIME_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3INTERROGATEDB_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+install(FILES ${P3IGATERUNTIME_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 # ALSO: This has an Interrogate binding! Take care of that if we want it.
 # Note we don't use the regular Interrogate macros; this has some custom flags

dtool/src/prc/CMakeLists.txt

@@ -94,9 +94,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3prc
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PRC_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PRC_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/metalibs/panda/CMakeLists.txt

@@ -26,7 +26,7 @@ unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
 
 install(TARGETS panda
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)

panda/metalibs/pandaegg/CMakeLists.txt

@@ -11,9 +11,9 @@ target_link_libraries(pandaegg panda)
 
 install(TARGETS pandaegg
   EXPORT Egg COMPONENT Egg
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT EggDevel)
 
 export_targets(Egg COMPONENT EggDevel)

panda/metalibs/pandaexpress/CMakeLists.txt

@@ -6,7 +6,7 @@ unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
 
 install(TARGETS pandaexpress
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)

panda/metalibs/pandaphysics/CMakeLists.txt

@@ -6,7 +6,7 @@ unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
 
 install(TARGETS pandaphysics
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)

panda/src/audio/CMakeLists.txt

@@ -31,9 +31,9 @@ target_interrogate(p3audio ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3audio
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3AUDIO_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3AUDIO_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/audiotraits/CMakeLists.txt

@@ -23,11 +23,11 @@ if(HAVE_FMODEX)
 
   install(TARGETS p3fmod_audio
     EXPORT FMOD COMPONENT FMOD
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT FMODDevel)
-  install(FILES ${P3FMOD_HEADERS} COMPONENT FMODDevel DESTINATION include/panda3d)
+  install(FILES ${P3FMOD_HEADERS} COMPONENT FMODDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
   export_targets(FMOD NAMESPACE "Panda3D::FMOD::" COMPONENT FMODDevel)
 endif()
@@ -51,11 +51,11 @@ if(HAVE_OPENAL)
 
   install(TARGETS p3openal_audio
     EXPORT OpenAL COMPONENT OpenAL
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT OpenALDevel)
-  install(FILES ${P3OPENAL_HEADERS} COMPONENT OpenALDevel DESTINATION include/panda3d)
+  install(FILES ${P3OPENAL_HEADERS} COMPONENT OpenALDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
   export_targets(OpenAL NAMESPACE "Panda3D::OpenAL::" COMPONENT OpenALDevel)
 endif()

panda/src/bullet/CMakeLists.txt

@@ -116,10 +116,10 @@ target_interrogate(p3bullet ALL)
 
 install(TARGETS p3bullet
   EXPORT Bullet COMPONENT Bullet
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT BulletDevel)
-install(FILES ${P3BULLET_HEADERS} COMPONENT BulletDevel DESTINATION include/panda3d)
+install(FILES ${P3BULLET_HEADERS} COMPONENT BulletDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(Bullet COMPONENT BulletDevel)

panda/src/chan/CMakeLists.txt

@@ -61,9 +61,9 @@ target_interrogate(p3chan ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3chan
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3CHAN_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3CHAN_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/char/CMakeLists.txt

@@ -28,9 +28,9 @@ target_interrogate(p3char ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3char
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3CHAR_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3CHAR_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/cocoadisplay/CMakeLists.txt

@@ -43,5 +43,5 @@ target_link_libraries(p3cocoadisplay
   ${CORE_VIDEO_LIBRARY})
 
 if(NOT BUILD_METALIBS)
-  install(TARGETS p3cocoadisplay EXPORT OpenGL COMPONENT OpenGL DESTINATION lib)
+  install(TARGETS p3cocoadisplay EXPORT OpenGL COMPONENT OpenGL DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

panda/src/collide/CMakeLists.txt

@@ -74,9 +74,9 @@ target_interrogate(p3collide ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3collide
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3COLLIDE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3COLLIDE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/configfiles/CMakeLists.txt

@@ -27,4 +27,13 @@ if(IS_MULTICONFIG)
                 INPUT "${PROJECT_BINARY_DIR}/etc/20_panda.prc")
 endif()
 
-install(FILES "${CMAKE_BINARY_DIR}/etc/20_panda.prc" COMPONENT Core DESTINATION etc)
+if(WIN32)
+  set(_confdir "etc")
+
+else()
+  # On Unices, ask the GNUInstallDirs module where /etc is
+  set(_confdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+
+endif()
+
+install(FILES "${CMAKE_BINARY_DIR}/etc/20_panda.prc" COMPONENT Core DESTINATION ${_confdir})

panda/src/cull/CMakeLists.txt

@@ -29,9 +29,9 @@ target_interrogate(p3cull ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3cull
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3CULL_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3CULL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/device/CMakeLists.txt

@@ -72,9 +72,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3device
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DEVICE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DEVICE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/dgraph/CMakeLists.txt

@@ -21,9 +21,9 @@ target_interrogate(p3dgraph ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dgraph
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DGRAPH_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DGRAPH_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/display/CMakeLists.txt

@@ -108,9 +108,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3display
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DISPLAY_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DISPLAY_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/distort/CMakeLists.txt

@@ -26,8 +26,8 @@ target_interrogate(pandafx ALL)
 
 install(TARGETS pandafx
   EXPORT Core COMPONENT Core
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT CoreDevel)
-install(FILES ${P3DISTORT_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DISTORT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/downloader/CMakeLists.txt

@@ -67,9 +67,9 @@ target_interrogate(p3downloader ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3downloader
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DOWNLOADER_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DOWNLOADER_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/downloadertools/CMakeLists.txt

@@ -25,7 +25,7 @@ if(HAVE_OPENSSL)
 
   install(TARGETS apply_patch build_patch show_ddb check_md5 pencrypt pdecrypt
     EXPORT Tools COMPONENT Tools
-    DESTINATION bin)
+    DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(HAVE_ZLIB)
@@ -47,9 +47,9 @@ if(HAVE_ZLIB)
 
   install(TARGETS check_adler check_crc pzip punzip
     EXPORT Tools COMPONENT Tools
-    DESTINATION bin)
+    DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 add_executable(multify multify.cxx)
 target_link_libraries(multify panda)
-install(TARGETS multify EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS multify EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

panda/src/dxgsg9/CMakeLists.txt

@@ -48,9 +48,9 @@ target_compile_definitions(p3dxgsg9 PUBLIC USE_GENERIC_DXERR_LIBRARY) # FIXME
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dxgsg9
     EXPORT DX9 COMPONENT DX9
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT DX9Devel)
 endif()
-install(FILES ${P3DXGSG9_HEADERS} COMPONENT DX9Devel DESTINATION include/panda3d)
+install(FILES ${P3DXGSG9_HEADERS} COMPONENT DX9Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/dxml/CMakeLists.txt

@@ -20,9 +20,9 @@ target_interrogate(p3dxml ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3dxml
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3DXML_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3DXML_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/egg/CMakeLists.txt

@@ -107,9 +107,9 @@ target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} EXTENSIONS ${P3EGG_IG
 if(NOT BUILD_METALIBS)
   install(TARGETS p3egg
     EXPORT Egg COMPONENT Egg
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT EggDevel)
 endif()
-install(FILES ${P3EGG_HEADERS} COMPONENT EggDevel DESTINATION include/panda3d)
+install(FILES ${P3EGG_HEADERS} COMPONENT EggDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/egg2pg/CMakeLists.txt

@@ -41,9 +41,9 @@ target_interrogate(p3egg2pg ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3egg2pg
     EXPORT Egg COMPONENT Egg
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT EggDevel)
 endif()
-install(FILES ${P3EGG2PG_HEADERS} COMPONENT EggDevel DESTINATION include/panda3d)
+install(FILES ${P3EGG2PG_HEADERS} COMPONENT EggDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/egldisplay/CMakeLists.txt

@@ -38,9 +38,9 @@ if(HAVE_GLES1)
   if(NOT BUILD_METALIBS)
     install(TARGETS p3egldisplay_gles1
       EXPORT GLES COMPONENT GLES
-      DESTINATION lib
-      RUNTIME DESTINATION bin
-      INCLUDES DESTINATION include/panda3d
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
       ARCHIVE COMPONENT GLESDevel)
   endif()
 endif()
@@ -56,11 +56,11 @@ if(HAVE_GLES2)
   if(NOT BUILD_METALIBS)
     install(TARGETS p3egldisplay_gles2
       EXPORT GLES COMPONENT GLES
-      DESTINATION lib
-      RUNTIME DESTINATION bin
-      INCLUDES DESTINATION include/panda3d
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
       ARCHIVE COMPONENT GLESDevel)
   endif()
 endif()
 
-install(FILES ${P3EGLDISPLAY_HEADERS} COMPONENT GLESDevel DESTINATION include/panda3d)
+install(FILES ${P3EGLDISPLAY_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/event/CMakeLists.txt

@@ -53,9 +53,9 @@ target_interrogate(p3event ALL EXTENSIONS ${P3EVENT_IGATEEXT})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3event
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3EVENT_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3EVENT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/express/CMakeLists.txt

@@ -165,9 +165,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3express
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3EXPRESS_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3EXPRESS_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/ffmpeg/CMakeLists.txt

@@ -36,10 +36,10 @@ endif()
 
 install(TARGETS p3ffmpeg
   EXPORT FFmpeg COMPONENT FFmpeg
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT FFmpegDevel)
-install(FILES ${P3FFMPEG_HEADERS} COMPONENT FFmpegDevel DESTINATION include/panda3d)
+install(FILES ${P3FFMPEG_HEADERS} COMPONENT FFmpegDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(FFmpeg COMPONENT FFmpegDevel)

panda/src/framework/CMakeLists.txt

@@ -53,10 +53,10 @@ endforeach(var)
 
 install(TARGETS p3framework
   EXPORT Framework COMPONENT Framework
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT FrameworkDevel)
-install(FILES ${P3FRAMEWORK_HEADERS} COMPONENT FrameworkDevel DESTINATION include/panda3d)
+install(FILES ${P3FRAMEWORK_HEADERS} COMPONENT FrameworkDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(Framework COMPONENT FrameworkDevel)

panda/src/gles2gsg/CMakeLists.txt

@@ -21,9 +21,9 @@ target_link_libraries(p3gles2gsg p3glstuff panda
 if(NOT BUILD_METALIBS)
   install(TARGETS p3gles2gsg
     EXPORT GLES COMPONENT GLES
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT GLESDevel)
 endif()
-install(FILES ${P3GLES2GSG_HEADERS} COMPONENT GLESDevel DESTINATION include/panda3d)
+install(FILES ${P3GLES2GSG_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/glesgsg/CMakeLists.txt

@@ -21,9 +21,9 @@ target_link_libraries(p3glesgsg p3glstuff panda
 if(NOT BUILD_METALIBS)
   install(TARGETS p3glesgsg
     EXPORT GLES COMPONENT GLES
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT GLESDevel)
 endif()
-install(FILES ${P3GLESGSG_HEADERS} COMPONENT GLESDevel DESTINATION include/panda3d)
+install(FILES ${P3GLESGSG_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/glgsg/CMakeLists.txt

@@ -20,9 +20,9 @@ target_link_libraries(p3glgsg p3glstuff panda
 if(NOT BUILD_METALIBS)
   install(TARGETS p3glgsg
     EXPORT OpenGL COMPONENT OpenGL
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT OpenGLDevel)
 endif()
-install(FILES ${P3GLGSG_HEADERS} COMPONENT OpenGLDevel DESTINATION include/panda3d)
+install(FILES ${P3GLGSG_HEADERS} COMPONENT OpenGLDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/glstuff/CMakeLists.txt

@@ -40,9 +40,9 @@ target_link_libraries(p3glstuff panda)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3glstuff
     EXPORT OpenGL COMPONENT OpenGL
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT OpenGLDevel)
 endif()
-install(FILES ${P3GLSTUFF_HEADERS} COMPONENT OpenGLDevel DESTINATION include/panda3d)
+install(FILES ${P3GLSTUFF_HEADERS} COMPONENT OpenGLDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/glxdisplay/CMakeLists.txt

@@ -29,5 +29,5 @@ add_component_library(p3glxdisplay SYMBOL BUILDING_PANDA_GLXDISPLAY
 target_link_libraries(p3glxdisplay p3glgsg p3x11display)
 
 if(NOT BUILD_METALIBS)
-  install(TARGETS p3glxdisplay EXPORT OpenGL COMPONENT OpenGL DESTINATION lib)
+  install(TARGETS p3glxdisplay EXPORT OpenGL COMPONENT OpenGL DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

panda/src/gobj/CMakeLists.txt

@@ -187,9 +187,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3gobj
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3GOBJ_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3GOBJ_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/grutil/CMakeLists.txt

@@ -58,9 +58,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3grutil
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3GRUTIL_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3GRUTIL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/gsgbase/CMakeLists.txt

@@ -19,9 +19,9 @@ target_interrogate(p3gsgbase ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3gsgbase
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3GSGBASE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3GSGBASE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/linmath/CMakeLists.txt

@@ -55,9 +55,9 @@ target_interrogate(p3linmath ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3linmath
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3LINMATH_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3LINMATH_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/mathutil/CMakeLists.txt

@@ -74,9 +74,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3mathutil
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3MATHUTIL_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3MATHUTIL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/movies/CMakeLists.txt

@@ -54,9 +54,9 @@ target_interrogate(p3movies ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3movies
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3MOVIES_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3MOVIES_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/nativenet/CMakeLists.txt

@@ -40,9 +40,9 @@ target_interrogate(p3nativenet ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3nativenet
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3NATIVENET_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3NATIVENET_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/net/CMakeLists.txt

@@ -43,9 +43,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3net
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3NET_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3NET_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/ode/CMakeLists.txt

@@ -94,10 +94,10 @@ target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} EXTENSIONS ${P3ODE_IGATEEXT})
 
 install(TARGETS p3ode
   EXPORT ODE COMPONENT ODE
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT ODEDevel)
-install(FILES ${P3ODE_HEADERS} COMPONENT ODEDevel DESTINATION include/panda3d)
+install(FILES ${P3ODE_HEADERS} COMPONENT ODEDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(ODE COMPONENT ODEDevel)

panda/src/pandabase/CMakeLists.txt

@@ -10,5 +10,5 @@ set(P3PANDABASE_SOURCES
 add_library(p3pandabase INTERFACE)
 target_link_libraries(p3pandabase INTERFACE p3dtool)
 
-install(FILES ${P3PANDABASE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PANDABASE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 install(TARGETS p3pandabase EXPORT Core COMPONENT Core)

panda/src/parametrics/CMakeLists.txt

@@ -43,9 +43,9 @@ target_interrogate(p3parametrics ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3parametrics
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PARAMETRICS_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PARAMETRICS_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/particlesystem/CMakeLists.txt

@@ -56,9 +56,9 @@ target_interrogate(p3particlesystem ${P3PARTICLESYSTEM_IGATE_SOURCES})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3particlesystem
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PARTICLESYSTEM_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PARTICLESYSTEM_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pgraph/CMakeLists.txt

@@ -233,9 +233,9 @@ target_interrogate(p3pgraph ALL EXTENSIONS ${P3PGRAPH_IGATEEXT})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pgraph
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PGRAPH_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PGRAPH_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pgraphnodes/CMakeLists.txt

@@ -53,9 +53,9 @@ target_interrogate(p3pgraphnodes ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pgraphnodes
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PGRAPHNODES_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PGRAPHNODES_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pgui/CMakeLists.txt

@@ -49,9 +49,9 @@ target_interrogate(p3pgui ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pgui
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PGUI_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PGUI_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/physics/CMakeLists.txt

@@ -47,9 +47,9 @@ target_interrogate(p3physics ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3physics
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PHYSICS_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PHYSICS_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pipeline/CMakeLists.txt

@@ -140,9 +140,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pipeline
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PIPELINE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PIPELINE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pnmimage/CMakeLists.txt

@@ -48,9 +48,9 @@ target_interrogate(p3pnmimage ALL EXTENSIONS ${P3PNMIMAGE_IGATEEXT})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pnmimage
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PNMIMAGE_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PNMIMAGE_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pnmimagetypes/CMakeLists.txt

@@ -42,7 +42,7 @@ set_target_properties(p3pnmimagetypes PROPERTIES CXX_EXCEPTIONS ON)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pnmimagetypes
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     ARCHIVE COMPONENT CoreDevel)
 endif()

panda/src/pnmtext/CMakeLists.txt

@@ -27,9 +27,9 @@ target_interrogate(p3pnmtext ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pnmtext
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PNMTEXT_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PNMTEXT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/pstatclient/CMakeLists.txt

@@ -36,10 +36,10 @@ target_interrogate(p3pstatclient ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3pstatclient
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PSTATCLIENT_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
-install(FILES config_pstats.h COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PSTATCLIENT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+install(FILES config_pstats.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/putil/CMakeLists.txt

@@ -141,10 +141,10 @@ target_interrogate(p3putil ALL EXTENSIONS ${P3PUTIL_IGATEEXT})
 if(NOT BUILD_METALIBS)
   install(TARGETS p3putil
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3PUTIL_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
-install(FILES config_util.h COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3PUTIL_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+install(FILES config_util.h COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/recorder/CMakeLists.txt

@@ -26,9 +26,9 @@ target_interrogate(p3recorder ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3recorder
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3RECORDER_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3RECORDER_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/testbed/CMakeLists.txt

@@ -6,4 +6,4 @@ endif()
 
 add_executable(pview pview.cxx)
 target_link_libraries(pview p3framework)
-install(TARGETS pview EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS pview EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

panda/src/text/CMakeLists.txt

@@ -50,9 +50,9 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3text
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3TEXT_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3TEXT_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/tform/CMakeLists.txt

@@ -37,9 +37,9 @@ target_interrogate(p3tform ALL)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3tform
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT CoreDevel)
 endif()
-install(FILES ${P3TFORM_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d)
+install(FILES ${P3TFORM_HEADERS} COMPONENT CoreDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/vision/CMakeLists.txt

@@ -45,10 +45,10 @@ endif()
 
 install(TARGETS p3vision
   EXPORT Vision COMPONENT Vision
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT VisionDevel)
-install(FILES ${P3VISION_HEADERS} COMPONENT VisionDevel DESTINATION include/panda3d)
+install(FILES ${P3VISION_HEADERS} COMPONENT VisionDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(Vision COMPONENT VisionDevel)

panda/src/vrpn/CMakeLists.txt

@@ -37,10 +37,10 @@ target_interrogate(p3vrpn ALL)
 
 install(TARGETS p3vrpn
   EXPORT VRPN COMPONENT VRPN
-  DESTINATION lib
-  RUNTIME DESTINATION bin
-  INCLUDES DESTINATION include/panda3d
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
   ARCHIVE COMPONENT VRPNDevel)
-install(FILES ${P3VRPN_HEADERS} COMPONENT VRPNDevel DESTINATION include/panda3d)
+install(FILES ${P3VRPN_HEADERS} COMPONENT VRPNDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
 
 export_targets(VRPN COMPONENT VRPNDevel)

panda/src/wgldisplay/CMakeLists.txt

@@ -27,9 +27,9 @@ target_link_libraries(p3wgldisplay p3glgsg p3windisplay)
 if(NOT BUILD_METALIBS)
   install(TARGETS p3wgldisplay
     EXPORT OpenGL COMPONENT OpenGL
-    DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/panda3d
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
     ARCHIVE COMPONENT OpenGLDevel)
 endif()
-install(FILES ${P3WGLDISPLAY_HEADERS} COMPONENT OpenGLDevel DESTINATION include/panda3d)
+install(FILES ${P3WGLDISPLAY_HEADERS} COMPONENT OpenGLDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

panda/src/windisplay/CMakeLists.txt

@@ -27,7 +27,7 @@ endif()
 if(NOT BUILD_METALIBS)
   install(TARGETS p3windisplay
     EXPORT Core COMPONENT Core
-    DESTINATION lib
-    RUNTIME DESTINATION bin
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     ARCHIVE COMPONENT CoreDevel)
 endif()

panda/src/x11display/CMakeLists.txt

@@ -17,5 +17,5 @@ add_component_library(p3x11display SYMBOL BUILDING_PANDAX11
 target_link_libraries(p3x11display panda PKG::X11)
 
 if(NOT BUILD_METALIBS)
-  install(TARGETS p3x11display EXPORT Core COMPONENT Core DESTINATION lib)
+  install(TARGETS p3x11display EXPORT Core COMPONENT Core DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

pandatool/src/bam/CMakeLists.txt

@@ -1,12 +1,12 @@
 add_executable(bam-info bamInfo.cxx bamInfo.h)
 target_link_libraries(bam-info p3progbase panda)
-install(TARGETS bam-info EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS bam-info EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 if(HAVE_EGG)
 
   add_executable(egg2bam eggToBam.cxx eggToBam.h)
   target_link_libraries(egg2bam p3eggbase p3progbase panda)
-  install(TARGETS egg2bam EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS egg2bam EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   if(HAVE_SQUISH)
     target_compile_definitions(egg2bam PRIVATE HAVE_SQUISH)
@@ -14,10 +14,10 @@ if(HAVE_EGG)
 
   add_executable(bam2egg bamToEgg.cxx bamToEgg.h)
   target_link_libraries(bam2egg p3converter p3eggbase p3progbase panda)
-  install(TARGETS bam2egg EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS bam2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   add_executable(pts2bam ptsToBam.cxx ptsToBam.h)
   target_link_libraries(pts2bam p3progbase pandaegg panda)
-  install(TARGETS pts2bam EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS pts2bam EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 endif()

pandatool/src/daeprogs/CMakeLists.txt

@@ -2,10 +2,10 @@ if(HAVE_EGG AND HAVE_FCOLLADA)
 
   add_executable(egg2dae eggToDAE.cxx eggToDAE.h)
   target_link_libraries(egg2dae p3daeegg p3eggbase p3progbase)
-  install(TARGETS egg2dae EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS egg2dae EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   add_executable(dae2egg daeToEgg.cxx daeToEgg.h)
   target_link_libraries(dae2egg p3daeegg p3eggbase p3progbase)
-  install(TARGETS dae2egg EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS dae2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 endif()

pandatool/src/dxfprogs/CMakeLists.txt

@@ -1,15 +1,15 @@
 add_executable(dxf-points dxfPoints.cxx dxfPoints.h)
 target_link_libraries(dxf-points p3progbase p3dxf)
-install(TARGETS dxf-points EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS dxf-points EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 if(HAVE_EGG)
 
   add_executable(egg2dxf eggToDXF.cxx eggToDXF.h eggToDXFLayer.cxx eggToDXFLayer.h)
   target_link_libraries(egg2dxf p3dxfegg p3eggbase p3progbase)
-  install(TARGETS egg2dxf EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS egg2dxf EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   add_executable(dxf2egg dxfToEgg.cxx dxfToEgg.h)
   target_link_libraries(dxf2egg p3dxfegg p3eggbase p3progbase)
-  install(TARGETS dxf2egg EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS dxf2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 endif()

pandatool/src/egg-mkfont/CMakeLists.txt

@@ -18,4 +18,4 @@ composite_sources(egg-mkfont P3EGG_MKFONT_SOURCES)
 add_executable(egg-mkfont ${P3EGG_MKFONT_HEADERS} ${P3EGG_MKFONT_SOURCES})
 target_link_libraries(egg-mkfont p3palettizer p3eggbase p3pandatoolbase)
 
-install(TARGETS egg-mkfont EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-mkfont EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

pandatool/src/egg-optchar/CMakeLists.txt

@@ -20,4 +20,4 @@ composite_sources(egg-optchar P3EGG_OPTCHAR_SOURCES)
 add_executable(egg-optchar ${P3EGG_OPTCHAR_HEADERS} ${P3EGG_OPTCHAR_SOURCES})
 target_link_libraries(egg-optchar p3eggcharbase)
 
-install(TARGETS egg-optchar EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-optchar EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

pandatool/src/egg-palettize/CMakeLists.txt

@@ -4,7 +4,7 @@ endif()
 
 add_executable(egg-palettize eggPalettize.cxx eggPalettize.h)
 target_link_libraries(egg-palettize p3palettizer p3eggbase p3progbase)
-install(TARGETS egg-palettize EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-palettize EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_library(p3txafile txaFileFilter.cxx txaFileFilter.h txaFileFilter.I)
 set_target_properties(p3txafile PROPERTIES DEFINE_SYMBOL BUILDING_MISC)
@@ -12,5 +12,5 @@ target_link_libraries(p3txafile PRIVATE p3palettizer)
 if(BUILD_SHARED_LIBS)
   # We can't install this if we're doing a static build, because it depends on
   # a static library that isn't installed.
-  install(TARGETS p3txafile EXPORT Tools COMPONENT Tools DESTINATION lib RUNTIME DESTINATION bin)
+  install(TARGETS p3txafile EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

pandatool/src/egg-qtess/CMakeLists.txt

@@ -28,4 +28,4 @@ composite_sources(egg-qtess P3EGG_QTESS_SOURCES)
 add_executable(egg-qtess ${P3EGG_QTESS_HEADERS} ${P3EGG_QTESS_SOURCES})
 target_link_libraries(egg-qtess p3eggbase)
 
-install(TARGETS egg-qtess EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-qtess EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

pandatool/src/eggprogs/CMakeLists.txt

@@ -4,36 +4,36 @@ endif()
 
 add_executable(egg-crop eggCrop.cxx eggCrop.h)
 target_link_libraries(egg-crop p3eggbase)
-install(TARGETS egg-crop EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-crop EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-list-textures eggListTextures.cxx eggListTextures.h)
 target_link_libraries(egg-list-textures p3eggbase)
-install(TARGETS egg-list-textures EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-list-textures EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-make-tube eggMakeTube.cxx eggMakeTube.h)
 target_link_libraries(egg-make-tube p3eggbase)
-install(TARGETS egg-make-tube EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-make-tube EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-rename eggRename.cxx eggRename.h)
 target_link_libraries(egg-rename p3eggbase)
-install(TARGETS egg-rename EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-rename EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-retarget-anim eggRetargetAnim.cxx eggRetargetAnim.h)
 target_link_libraries(egg-retarget-anim p3eggcharbase)
-install(TARGETS egg-retarget-anim EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-retarget-anim EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-texture-cards eggTextureCards.cxx eggTextureCards.h)
 target_link_libraries(egg-texture-cards p3eggbase)
-install(TARGETS egg-texture-cards EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-texture-cards EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg2c eggToC.cxx eggToC.h)
 target_link_libraries(egg2c p3eggbase)
-install(TARGETS egg2c EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg2c EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-topstrip eggTopstrip.cxx eggTopstrip.h)
 target_link_libraries(egg-topstrip p3eggcharbase)
-install(TARGETS egg-topstrip EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-topstrip EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(egg-trans eggTrans.cxx eggTrans.h)
 target_link_libraries(egg-trans p3eggbase)
-install(TARGETS egg-trans EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS egg-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})

pandatool/src/fltprogs/CMakeLists.txt

@@ -1,19 +1,19 @@
 add_executable(flt-info fltInfo.cxx fltInfo.h)
 target_link_libraries(flt-info p3progbase p3flt)
-install(TARGETS flt-info EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS flt-info EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(flt-trans fltTrans.cxx fltTrans.h)
 target_link_libraries(flt-trans p3progbase p3flt)
-install(TARGETS flt-trans EXPORT Tools COMPONENT Tools DESTINATION bin)
+install(TARGETS flt-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 if(HAVE_EGG)
 
   add_executable(egg2flt eggToFlt.cxx eggToFlt.h)
   target_link_libraries(egg2flt p3fltegg p3eggbase p3progbase)
-  install(TARGETS egg2flt EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS egg2flt EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   add_executable(flt2egg fltToEgg.cxx fltToEgg.h)
   target_link_libraries(flt2egg p3fltegg p3eggbase p3progbase)
-  install(TARGETS flt2egg EXPORT Tools COMPONENT Tools DESTINATION bin)
+  install(TARGETS flt2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 endif()