diff --git a/CMakeLists.txt b/CMakeLists.txt index 402f0e4c5b..d3fd66addc 100644 --- a/CMakeLists.txt +++ b/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_ 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) diff --git a/cmake/macros/BuildMetalib.cmake b/cmake/macros/BuildMetalib.cmake index 7b4c1d8173..079b794b85 100644 --- a/cmake/macros/BuildMetalib.cmake +++ b/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 "$/include/panda3d>") + INTERFACE "$/${CMAKE_INSTALL_INCLUDEDIR}/panda3d>") endfunction(add_metalib) diff --git a/cmake/macros/PackageConfig.cmake b/cmake/macros/PackageConfig.cmake index 8c1cf70ee5..2b692e543d 100644 --- a/cmake/macros/PackageConfig.cmake +++ b/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) diff --git a/cmake/macros/Python.cmake b/cmake/macros/Python.cmake index e247052214..32258d4a6d 100644 --- a/cmake/macros/Python.cmake +++ b/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() diff --git a/contrib/src/ai/CMakeLists.txt b/contrib/src/ai/CMakeLists.txt index 11bbd56c3e..3e7f028444 100644 --- a/contrib/src/ai/CMakeLists.txt +++ b/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) diff --git a/contrib/src/contribbase/CMakeLists.txt b/contrib/src/contribbase/CMakeLists.txt index a60e741c6e..630bffc0a6 100644 --- a/contrib/src/contribbase/CMakeLists.txt +++ b/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) diff --git a/contrib/src/rplight/CMakeLists.txt b/contrib/src/rplight/CMakeLists.txt index c4b21d057d..9f476c30cd 100644 --- a/contrib/src/rplight/CMakeLists.txt +++ b/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) diff --git a/direct/CMakeLists.txt b/direct/CMakeLists.txt index 18847d4b9b..1e4e57c842 100644 --- a/direct/CMakeLists.txt +++ b/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) diff --git a/direct/src/dcparse/CMakeLists.txt b/direct/src/dcparse/CMakeLists.txt index 747f5896b2..e5cdee5b18 100644 --- a/direct/src/dcparse/CMakeLists.txt +++ b/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}) diff --git a/direct/src/dcparser/CMakeLists.txt b/direct/src/dcparser/CMakeLists.txt index 248197d21b..e90ca815d8 100644 --- a/direct/src/dcparser/CMakeLists.txt +++ b/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) diff --git a/direct/src/deadrec/CMakeLists.txt b/direct/src/deadrec/CMakeLists.txt index e4ef5738fe..0a2bb1b96a 100644 --- a/direct/src/deadrec/CMakeLists.txt +++ b/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) diff --git a/direct/src/directbase/CMakeLists.txt b/direct/src/directbase/CMakeLists.txt index c4ae151277..eea5100de2 100644 --- a/direct/src/directbase/CMakeLists.txt +++ b/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) diff --git a/direct/src/distributed/CMakeLists.txt b/direct/src/distributed/CMakeLists.txt index 6a675e7319..9b60daff62 100644 --- a/direct/src/distributed/CMakeLists.txt +++ b/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) diff --git a/direct/src/interval/CMakeLists.txt b/direct/src/interval/CMakeLists.txt index 0b7cf77d59..2eba8a917a 100644 --- a/direct/src/interval/CMakeLists.txt +++ b/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) diff --git a/direct/src/motiontrail/CMakeLists.txt b/direct/src/motiontrail/CMakeLists.txt index 30b9745c2f..2c4ba8b78b 100644 --- a/direct/src/motiontrail/CMakeLists.txt +++ b/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) diff --git a/direct/src/showbase/CMakeLists.txt b/direct/src/showbase/CMakeLists.txt index c080fbf62c..815aeb5bc2 100644 --- a/direct/src/showbase/CMakeLists.txt +++ b/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) diff --git a/dtool/CompilerFlags.cmake b/dtool/CompilerFlags.cmake index 2e4194ff9b..2d430e81a7 100644 --- a/dtool/CompilerFlags.cmake +++ b/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. diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index a6fc3a0147..a181fb12e9 100644 --- a/dtool/LocalSetup.cmake +++ b/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") diff --git a/dtool/metalibs/dtool/CMakeLists.txt b/dtool/metalibs/dtool/CMakeLists.txt index a952ff7f73..fc5eb3c722 100644 --- a/dtool/metalibs/dtool/CMakeLists.txt +++ b/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) diff --git a/dtool/metalibs/dtoolconfig/CMakeLists.txt b/dtool/metalibs/dtoolconfig/CMakeLists.txt index e0527e310e..3d36dcf39e 100644 --- a/dtool/metalibs/dtoolconfig/CMakeLists.txt +++ b/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) diff --git a/dtool/src/cppparser/CMakeLists.txt b/dtool/src/cppparser/CMakeLists.txt index 2f865933f1..4408a52198 100644 --- a/dtool/src/cppparser/CMakeLists.txt +++ b/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}) diff --git a/dtool/src/dconfig/CMakeLists.txt b/dtool/src/dconfig/CMakeLists.txt index 550d8debd3..ccd9e6c144 100644 --- a/dtool/src/dconfig/CMakeLists.txt +++ b/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) diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt index 69443ce6e4..079e6a4e34 100644 --- a/dtool/src/dtoolbase/CMakeLists.txt +++ b/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) diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt index 7d92b1b405..0ad93fd8c5 100644 --- a/dtool/src/dtoolutil/CMakeLists.txt +++ b/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) diff --git a/dtool/src/interrogate/CMakeLists.txt b/dtool/src/interrogate/CMakeLists.txt index efa0933717..a4a70774d7 100644 --- a/dtool/src/interrogate/CMakeLists.txt +++ b/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 diff --git a/dtool/src/interrogatedb/CMakeLists.txt b/dtool/src/interrogatedb/CMakeLists.txt index 5f89ce4777..947bb93cc9 100644 --- a/dtool/src/interrogatedb/CMakeLists.txt +++ b/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 diff --git a/dtool/src/prc/CMakeLists.txt b/dtool/src/prc/CMakeLists.txt index cb5fb7ebfc..175494a716 100644 --- a/dtool/src/prc/CMakeLists.txt +++ b/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) diff --git a/panda/metalibs/panda/CMakeLists.txt b/panda/metalibs/panda/CMakeLists.txt index 73cd958902..d9dd160c8b 100644 --- a/panda/metalibs/panda/CMakeLists.txt +++ b/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) diff --git a/panda/metalibs/pandaegg/CMakeLists.txt b/panda/metalibs/pandaegg/CMakeLists.txt index 5836e38d2f..b8c4ba3730 100644 --- a/panda/metalibs/pandaegg/CMakeLists.txt +++ b/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) diff --git a/panda/metalibs/pandaexpress/CMakeLists.txt b/panda/metalibs/pandaexpress/CMakeLists.txt index 27d5d4f35f..0132dea0e9 100644 --- a/panda/metalibs/pandaexpress/CMakeLists.txt +++ b/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) diff --git a/panda/metalibs/pandaphysics/CMakeLists.txt b/panda/metalibs/pandaphysics/CMakeLists.txt index a18e867f3e..49041f5973 100644 --- a/panda/metalibs/pandaphysics/CMakeLists.txt +++ b/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) diff --git a/panda/src/audio/CMakeLists.txt b/panda/src/audio/CMakeLists.txt index 35f61710d4..3d37816b00 100644 --- a/panda/src/audio/CMakeLists.txt +++ b/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) diff --git a/panda/src/audiotraits/CMakeLists.txt b/panda/src/audiotraits/CMakeLists.txt index b565d5ae05..71c4da09eb 100644 --- a/panda/src/audiotraits/CMakeLists.txt +++ b/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() diff --git a/panda/src/bullet/CMakeLists.txt b/panda/src/bullet/CMakeLists.txt index 7f609a5264..29573468cd 100644 --- a/panda/src/bullet/CMakeLists.txt +++ b/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) diff --git a/panda/src/chan/CMakeLists.txt b/panda/src/chan/CMakeLists.txt index b1256346c0..0b1565d198 100644 --- a/panda/src/chan/CMakeLists.txt +++ b/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) diff --git a/panda/src/char/CMakeLists.txt b/panda/src/char/CMakeLists.txt index fd7dde17ee..d33bd470b0 100644 --- a/panda/src/char/CMakeLists.txt +++ b/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) diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt index 413eb1426d..ed6e4ca521 100644 --- a/panda/src/cocoadisplay/CMakeLists.txt +++ b/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() diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt index 57640941db..63ac4163e8 100644 --- a/panda/src/collide/CMakeLists.txt +++ b/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) diff --git a/panda/src/configfiles/CMakeLists.txt b/panda/src/configfiles/CMakeLists.txt index a95aa3d285..edaa95eeb2 100644 --- a/panda/src/configfiles/CMakeLists.txt +++ b/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}) diff --git a/panda/src/cull/CMakeLists.txt b/panda/src/cull/CMakeLists.txt index a955276eb2..0e5e099b00 100644 --- a/panda/src/cull/CMakeLists.txt +++ b/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) diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt index bf8294385c..fb4145e131 100644 --- a/panda/src/device/CMakeLists.txt +++ b/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) diff --git a/panda/src/dgraph/CMakeLists.txt b/panda/src/dgraph/CMakeLists.txt index 08184c0df2..10caff45ef 100644 --- a/panda/src/dgraph/CMakeLists.txt +++ b/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) diff --git a/panda/src/display/CMakeLists.txt b/panda/src/display/CMakeLists.txt index bed17c1f5f..3af8e1bbb2 100644 --- a/panda/src/display/CMakeLists.txt +++ b/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) diff --git a/panda/src/distort/CMakeLists.txt b/panda/src/distort/CMakeLists.txt index 727d3e2856..2a555fcdc9 100644 --- a/panda/src/distort/CMakeLists.txt +++ b/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) diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt index d453a53987..25ba1f6efc 100644 --- a/panda/src/downloader/CMakeLists.txt +++ b/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) diff --git a/panda/src/downloadertools/CMakeLists.txt b/panda/src/downloadertools/CMakeLists.txt index 5de61edac2..bed053fb61 100644 --- a/panda/src/downloadertools/CMakeLists.txt +++ b/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}) diff --git a/panda/src/dxgsg9/CMakeLists.txt b/panda/src/dxgsg9/CMakeLists.txt index 426a8837b6..6442a95e76 100644 --- a/panda/src/dxgsg9/CMakeLists.txt +++ b/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) diff --git a/panda/src/dxml/CMakeLists.txt b/panda/src/dxml/CMakeLists.txt index 56dc867099..8b67b09d35 100644 --- a/panda/src/dxml/CMakeLists.txt +++ b/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) diff --git a/panda/src/egg/CMakeLists.txt b/panda/src/egg/CMakeLists.txt index 029d148f3c..5cdd891182 100644 --- a/panda/src/egg/CMakeLists.txt +++ b/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) diff --git a/panda/src/egg2pg/CMakeLists.txt b/panda/src/egg2pg/CMakeLists.txt index 5fcde65105..e0dcd91763 100644 --- a/panda/src/egg2pg/CMakeLists.txt +++ b/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) diff --git a/panda/src/egldisplay/CMakeLists.txt b/panda/src/egldisplay/CMakeLists.txt index 7506bcaf95..9d7879362a 100644 --- a/panda/src/egldisplay/CMakeLists.txt +++ b/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) diff --git a/panda/src/event/CMakeLists.txt b/panda/src/event/CMakeLists.txt index d100545b7d..b0464ff793 100644 --- a/panda/src/event/CMakeLists.txt +++ b/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) diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt index a6248ad97d..cca0aa8874 100644 --- a/panda/src/express/CMakeLists.txt +++ b/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) diff --git a/panda/src/ffmpeg/CMakeLists.txt b/panda/src/ffmpeg/CMakeLists.txt index ccc820101b..08e3b252cc 100644 --- a/panda/src/ffmpeg/CMakeLists.txt +++ b/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) diff --git a/panda/src/framework/CMakeLists.txt b/panda/src/framework/CMakeLists.txt index 9b407d1cf4..d299c86bd1 100644 --- a/panda/src/framework/CMakeLists.txt +++ b/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) diff --git a/panda/src/gles2gsg/CMakeLists.txt b/panda/src/gles2gsg/CMakeLists.txt index 38ed68c621..515818f407 100644 --- a/panda/src/gles2gsg/CMakeLists.txt +++ b/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) diff --git a/panda/src/glesgsg/CMakeLists.txt b/panda/src/glesgsg/CMakeLists.txt index 9e43f774c9..feb0641509 100644 --- a/panda/src/glesgsg/CMakeLists.txt +++ b/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) diff --git a/panda/src/glgsg/CMakeLists.txt b/panda/src/glgsg/CMakeLists.txt index d3c923a99e..d8ddad03bb 100644 --- a/panda/src/glgsg/CMakeLists.txt +++ b/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) diff --git a/panda/src/glstuff/CMakeLists.txt b/panda/src/glstuff/CMakeLists.txt index 4304fe69e2..dc5840d96e 100644 --- a/panda/src/glstuff/CMakeLists.txt +++ b/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) diff --git a/panda/src/glxdisplay/CMakeLists.txt b/panda/src/glxdisplay/CMakeLists.txt index a5153e54b1..06dcc5cc0e 100644 --- a/panda/src/glxdisplay/CMakeLists.txt +++ b/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() diff --git a/panda/src/gobj/CMakeLists.txt b/panda/src/gobj/CMakeLists.txt index 1d62650e14..8ab4223467 100644 --- a/panda/src/gobj/CMakeLists.txt +++ b/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) diff --git a/panda/src/grutil/CMakeLists.txt b/panda/src/grutil/CMakeLists.txt index 2f88a25253..5d3fb2c9a9 100644 --- a/panda/src/grutil/CMakeLists.txt +++ b/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) diff --git a/panda/src/gsgbase/CMakeLists.txt b/panda/src/gsgbase/CMakeLists.txt index d83f31c90a..8060686e04 100644 --- a/panda/src/gsgbase/CMakeLists.txt +++ b/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) diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt index e60e1a5a59..acbe732e93 100644 --- a/panda/src/linmath/CMakeLists.txt +++ b/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) diff --git a/panda/src/mathutil/CMakeLists.txt b/panda/src/mathutil/CMakeLists.txt index ce03b71ee8..0716f4538d 100644 --- a/panda/src/mathutil/CMakeLists.txt +++ b/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) diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt index 53aff18c45..30e01d254a 100644 --- a/panda/src/movies/CMakeLists.txt +++ b/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) diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt index a91159e1c6..3c10e8d7cc 100644 --- a/panda/src/nativenet/CMakeLists.txt +++ b/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) diff --git a/panda/src/net/CMakeLists.txt b/panda/src/net/CMakeLists.txt index 3be1e77e40..b142134884 100644 --- a/panda/src/net/CMakeLists.txt +++ b/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) diff --git a/panda/src/ode/CMakeLists.txt b/panda/src/ode/CMakeLists.txt index 1e636d80f8..13bc422c74 100644 --- a/panda/src/ode/CMakeLists.txt +++ b/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) diff --git a/panda/src/pandabase/CMakeLists.txt b/panda/src/pandabase/CMakeLists.txt index deb4428068..73633927c1 100644 --- a/panda/src/pandabase/CMakeLists.txt +++ b/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) diff --git a/panda/src/parametrics/CMakeLists.txt b/panda/src/parametrics/CMakeLists.txt index ffeae49b97..5f1a96593f 100644 --- a/panda/src/parametrics/CMakeLists.txt +++ b/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) diff --git a/panda/src/particlesystem/CMakeLists.txt b/panda/src/particlesystem/CMakeLists.txt index b5db39a429..7a227f7dc6 100644 --- a/panda/src/particlesystem/CMakeLists.txt +++ b/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) diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt index 8110676c53..1852a7a15c 100644 --- a/panda/src/pgraph/CMakeLists.txt +++ b/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) diff --git a/panda/src/pgraphnodes/CMakeLists.txt b/panda/src/pgraphnodes/CMakeLists.txt index 03dce3a677..7b25e2b5bf 100644 --- a/panda/src/pgraphnodes/CMakeLists.txt +++ b/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) diff --git a/panda/src/pgui/CMakeLists.txt b/panda/src/pgui/CMakeLists.txt index 626f88c54a..0b68d56653 100644 --- a/panda/src/pgui/CMakeLists.txt +++ b/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) diff --git a/panda/src/physics/CMakeLists.txt b/panda/src/physics/CMakeLists.txt index 3e2f2d8c97..9b0b9456b6 100644 --- a/panda/src/physics/CMakeLists.txt +++ b/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) diff --git a/panda/src/pipeline/CMakeLists.txt b/panda/src/pipeline/CMakeLists.txt index 066c1a6a96..aa7852623b 100644 --- a/panda/src/pipeline/CMakeLists.txt +++ b/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) diff --git a/panda/src/pnmimage/CMakeLists.txt b/panda/src/pnmimage/CMakeLists.txt index 2301fba2fe..e22656a41d 100644 --- a/panda/src/pnmimage/CMakeLists.txt +++ b/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) diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt index fc086ce9e3..84c8ceeab7 100644 --- a/panda/src/pnmimagetypes/CMakeLists.txt +++ b/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() diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt index 2dd618a3b5..6acc9bd910 100644 --- a/panda/src/pnmtext/CMakeLists.txt +++ b/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) diff --git a/panda/src/pstatclient/CMakeLists.txt b/panda/src/pstatclient/CMakeLists.txt index 48bed3ae63..2aa8e37f77 100644 --- a/panda/src/pstatclient/CMakeLists.txt +++ b/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) diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt index e40872b034..5b5d841f19 100644 --- a/panda/src/putil/CMakeLists.txt +++ b/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) diff --git a/panda/src/recorder/CMakeLists.txt b/panda/src/recorder/CMakeLists.txt index 5c13272ae6..b65627db79 100644 --- a/panda/src/recorder/CMakeLists.txt +++ b/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) diff --git a/panda/src/testbed/CMakeLists.txt b/panda/src/testbed/CMakeLists.txt index 8170c13d55..3c497f42ac 100644 --- a/panda/src/testbed/CMakeLists.txt +++ b/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}) diff --git a/panda/src/text/CMakeLists.txt b/panda/src/text/CMakeLists.txt index b86aa33208..b7cbaee022 100644 --- a/panda/src/text/CMakeLists.txt +++ b/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) diff --git a/panda/src/tform/CMakeLists.txt b/panda/src/tform/CMakeLists.txt index 5159323eef..c8da2e176c 100644 --- a/panda/src/tform/CMakeLists.txt +++ b/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) diff --git a/panda/src/vision/CMakeLists.txt b/panda/src/vision/CMakeLists.txt index 38f1c474f4..284e764807 100644 --- a/panda/src/vision/CMakeLists.txt +++ b/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) diff --git a/panda/src/vrpn/CMakeLists.txt b/panda/src/vrpn/CMakeLists.txt index 231269b070..b3e6497dfe 100644 --- a/panda/src/vrpn/CMakeLists.txt +++ b/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) diff --git a/panda/src/wgldisplay/CMakeLists.txt b/panda/src/wgldisplay/CMakeLists.txt index d5ea724ef5..77c5e75db5 100644 --- a/panda/src/wgldisplay/CMakeLists.txt +++ b/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) diff --git a/panda/src/windisplay/CMakeLists.txt b/panda/src/windisplay/CMakeLists.txt index 7e0909a19e..b8edc72995 100644 --- a/panda/src/windisplay/CMakeLists.txt +++ b/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() diff --git a/panda/src/x11display/CMakeLists.txt b/panda/src/x11display/CMakeLists.txt index a35cdd0f2b..d3a3ebbe12 100644 --- a/panda/src/x11display/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/bam/CMakeLists.txt b/pandatool/src/bam/CMakeLists.txt index fbbffc70a9..79389b92ff 100644 --- a/pandatool/src/bam/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/daeprogs/CMakeLists.txt b/pandatool/src/daeprogs/CMakeLists.txt index 432fc5ecd2..67ffc386c4 100644 --- a/pandatool/src/daeprogs/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/dxfprogs/CMakeLists.txt b/pandatool/src/dxfprogs/CMakeLists.txt index 627474b02a..3cd39a0baa 100644 --- a/pandatool/src/dxfprogs/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/egg-mkfont/CMakeLists.txt b/pandatool/src/egg-mkfont/CMakeLists.txt index 7f2bdaf538..d453b3a5f4 100644 --- a/pandatool/src/egg-mkfont/CMakeLists.txt +++ b/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}) diff --git a/pandatool/src/egg-optchar/CMakeLists.txt b/pandatool/src/egg-optchar/CMakeLists.txt index 4d2083e92e..b30a070224 100644 --- a/pandatool/src/egg-optchar/CMakeLists.txt +++ b/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}) diff --git a/pandatool/src/egg-palettize/CMakeLists.txt b/pandatool/src/egg-palettize/CMakeLists.txt index 778ff0fc6c..18576f25d6 100644 --- a/pandatool/src/egg-palettize/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/egg-qtess/CMakeLists.txt b/pandatool/src/egg-qtess/CMakeLists.txt index a74919cfb5..c8f4244c8a 100644 --- a/pandatool/src/egg-qtess/CMakeLists.txt +++ b/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}) diff --git a/pandatool/src/eggprogs/CMakeLists.txt b/pandatool/src/eggprogs/CMakeLists.txt index 074ebc8e01..a14d33ab80 100644 --- a/pandatool/src/eggprogs/CMakeLists.txt +++ b/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}) diff --git a/pandatool/src/fltprogs/CMakeLists.txt b/pandatool/src/fltprogs/CMakeLists.txt index 9fc69bb15a..29a04166b7 100644 --- a/pandatool/src/fltprogs/CMakeLists.txt +++ b/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() diff --git a/pandatool/src/gtk-stats/CMakeLists.txt b/pandatool/src/gtk-stats/CMakeLists.txt index eb376985a9..b78ebf2e80 100644 --- a/pandatool/src/gtk-stats/CMakeLists.txt +++ b/pandatool/src/gtk-stats/CMakeLists.txt @@ -38,4 +38,4 @@ else() set_target_properties(gtk-stats PROPERTIES OUTPUT_NAME "pstats") endif() -install(TARGETS gtk-stats EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS gtk-stats EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/imageprogs/CMakeLists.txt b/pandatool/src/imageprogs/CMakeLists.txt index d89a4c62fe..f39b4b90fb 100644 --- a/pandatool/src/imageprogs/CMakeLists.txt +++ b/pandatool/src/imageprogs/CMakeLists.txt @@ -1,19 +1,19 @@ add_executable(image-fix-hidden-color imageFixHiddenColor.cxx imageFixHiddenColor.h) target_link_libraries(image-fix-hidden-color p3imagebase) -install(TARGETS image-fix-hidden-color EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS image-fix-hidden-color EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(image-info imageInfo.cxx imageInfo.h) target_link_libraries(image-info p3imagebase) -install(TARGETS image-info EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS image-info EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(image-resize imageResize.cxx imageResize.h) target_link_libraries(image-resize p3imagebase) -install(TARGETS image-resize EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS image-resize EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(image-transform-colors imageTransformColors.cxx imageTransformColors.h) target_link_libraries(image-transform-colors p3imagebase) -install(TARGETS image-transform-colors EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS image-transform-colors EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(image-trans imageTrans.cxx imageTrans.h) target_link_libraries(image-trans p3imagebase) -install(TARGETS image-trans EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS image-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/lwoprogs/CMakeLists.txt b/pandatool/src/lwoprogs/CMakeLists.txt index 50ec203a06..0a3c1de2e5 100644 --- a/pandatool/src/lwoprogs/CMakeLists.txt +++ b/pandatool/src/lwoprogs/CMakeLists.txt @@ -1,11 +1,11 @@ add_executable(lwo-scan lwoScan.cxx lwoScan.h) target_link_libraries(lwo-scan p3progbase p3lwo) -install(TARGETS lwo-scan EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS lwo-scan EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) if(HAVE_EGG) add_executable(lwo2egg lwoToEgg.cxx lwoToEgg.h) target_link_libraries(lwo2egg p3lwoegg p3eggbase p3progbase) - install(TARGETS lwo2egg EXPORT Tools COMPONENT Tools DESTINATION bin) + install(TARGETS lwo2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/pandatool/src/miscprogs/CMakeLists.txt b/pandatool/src/miscprogs/CMakeLists.txt index d42a8cd7ce..169cecc774 100644 --- a/pandatool/src/miscprogs/CMakeLists.txt +++ b/pandatool/src/miscprogs/CMakeLists.txt @@ -1,3 +1,3 @@ add_executable(bin2c binToC.cxx binToC.h) target_link_libraries(bin2c p3progbase) -install(TARGETS bin2c EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS bin2c EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/objprogs/CMakeLists.txt b/pandatool/src/objprogs/CMakeLists.txt index b93a62f6fd..adc398fab4 100644 --- a/pandatool/src/objprogs/CMakeLists.txt +++ b/pandatool/src/objprogs/CMakeLists.txt @@ -4,8 +4,8 @@ endif() add_executable(egg2obj eggToObj.cxx eggToObj.h) target_link_libraries(egg2obj p3objegg p3eggbase) -install(TARGETS egg2obj EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS egg2obj EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(obj2egg objToEgg.cxx objToEgg.h) target_link_libraries(obj2egg p3objegg p3eggbase p3progbase) -install(TARGETS obj2egg EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS obj2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/pfmprogs/CMakeLists.txt b/pandatool/src/pfmprogs/CMakeLists.txt index 800c94cd1b..13cb6af787 100644 --- a/pandatool/src/pfmprogs/CMakeLists.txt +++ b/pandatool/src/pfmprogs/CMakeLists.txt @@ -2,8 +2,8 @@ add_executable(pfm-bba config_pfmprogs.cxx config_pfmprogs.h pfmBba.cxx pfmBba.h) target_link_libraries(pfm-bba p3progbase) -install(TARGETS pfm-bba EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS pfm-bba EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(pfm-trans pfmTrans.cxx pfmTrans.h) target_link_libraries(pfm-trans p3progbase) -install(TARGETS pfm-trans EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS pfm-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/text-stats/CMakeLists.txt b/pandatool/src/text-stats/CMakeLists.txt index d5cff0d4fc..155b9013f3 100644 --- a/pandatool/src/text-stats/CMakeLists.txt +++ b/pandatool/src/text-stats/CMakeLists.txt @@ -16,4 +16,4 @@ composite_sources(text-stats TEXTSTATS_SOURCES) add_executable(text-stats ${TEXTSTATS_HEADERS} ${TEXTSTATS_SOURCES}) target_link_libraries(text-stats p3progbase p3pstatserver) -install(TARGETS text-stats EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS text-stats EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/vrmlprogs/CMakeLists.txt b/pandatool/src/vrmlprogs/CMakeLists.txt index 73fa9c9441..82a5e78bd3 100644 --- a/pandatool/src/vrmlprogs/CMakeLists.txt +++ b/pandatool/src/vrmlprogs/CMakeLists.txt @@ -1,11 +1,11 @@ add_executable(vrml-trans vrmlTrans.cxx vrmlTrans.h) target_link_libraries(vrml-trans p3progbase p3vrml) -install(TARGETS vrml-trans EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS vrml-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) if(HAVE_EGG) add_executable(vrml2egg vrmlToEgg.cxx vrmlToEgg.h) target_link_libraries(vrml2egg p3vrmlegg p3eggbase p3progbase) - install(TARGETS vrml2egg EXPORT Tools COMPONENT Tools DESTINATION bin) + install(TARGETS vrml2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/pandatool/src/win-stats/CMakeLists.txt b/pandatool/src/win-stats/CMakeLists.txt index 7c36316fc5..0cd7768c3a 100644 --- a/pandatool/src/win-stats/CMakeLists.txt +++ b/pandatool/src/win-stats/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(win-stats p3progbase p3pstatserver) # This program is NOT actually called win-stats. It's just pstats.exe set_target_properties(win-stats PROPERTIES OUTPUT_NAME "pstats") -install(TARGETS win-stats EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS win-stats EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pandatool/src/xfileprogs/CMakeLists.txt b/pandatool/src/xfileprogs/CMakeLists.txt index d8b7f5e810..29562db00d 100644 --- a/pandatool/src/xfileprogs/CMakeLists.txt +++ b/pandatool/src/xfileprogs/CMakeLists.txt @@ -1,15 +1,15 @@ add_executable(x-trans xFileTrans.cxx xFileTrans.h) target_link_libraries(x-trans p3progbase p3xfile) -install(TARGETS x-trans EXPORT Tools COMPONENT Tools DESTINATION bin) +install(TARGETS x-trans EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) if(HAVE_EGG) add_executable(egg2x eggToX.cxx eggToX.h) target_link_libraries(egg2x p3xfileegg p3eggbase p3progbase) - install(TARGETS egg2x EXPORT Tools COMPONENT Tools DESTINATION bin) + install(TARGETS egg2x EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) add_executable(x2egg xFileToEgg.cxx xFileToEgg.h) target_link_libraries(x2egg p3xfileegg p3eggbase p3progbase) - install(TARGETS x2egg EXPORT Tools COMPONENT Tools DESTINATION bin) + install(TARGETS x2egg EXPORT Tools COMPONENT Tools DESTINATION ${CMAKE_INSTALL_BINDIR}) endif()