TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Generate consistent paths in 20_panda.prc on all platforms

Browse Source
This commit is contained in:
Sam Edwards 2020-01-11 19:39:43 -07:00
parent 28b85d2f58
commit 7331692ae1
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
panda/src/configfiles/CMakeLists.txt
View File

@ -35,45 +35,45 @@ endif()
if(UNIX) if(UNIX)
# On Unices, ask the GNUInstallDirs module where /etc is -- and then install # On Unices, ask the GNUInstallDirs module where /etc is -- and then install
# ourselves into /etc/panda3d # ourselves into /etc/panda3d
set(_confdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}/panda3d") set(prc_install_path "${CMAKE_INSTALL_FULL_SYSCONFDIR}/panda3d")
set(_out_path "etc/panda3d") set(prc_build_path "${PANDA_OUTPUT_DIR}/etc/panda3d")
set(ETC_PARENT_PATH "../..")
else() else()
set(_confdir "etc") set(prc_install_path "etc")
set(_out_path "etc") set(prc_build_path "${PANDA_OUTPUT_DIR}/etc")
set(ETC_PARENT_PATH "..")
endif() endif()
if(IS_MULTICONFIG) # Path from the directory containing *.prc to the directory containing plugins
set(_out_path "${PROJECT_BINARY_DIR}/$<CONFIG>/${_out_path}") file(RELATIVE_PATH PLUGINS_PATH
else() "${prc_build_path}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(_out_path "${PROJECT_BINARY_DIR}/${_out_path}")
endif()
# Path from the directory containing *.prc to the *parent of* models/ # Path from the directory containing *.prc to the *parent of* models/
# In the build tree, reckoning this is pretty easy # In the build tree, reckoning this is pretty easy
set(MODELS_PARENT_PATH "..") file(RELATIVE_PATH MODELS_PARENT_PATH "${prc_build_path}" "${PANDA_OUTPUT_DIR}")
configure_file(panda.prc.in "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc") configure_file(panda.prc.in "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc")
# For the install tree, we need to introspect our paths # For the install tree, we need to introspect our paths
if(_confdir MATCHES "^/") set(abs_prc_install_path "${prc_install_path}")
set(_abs_confdir "${_confdir}") set(abs_datadir "${CMAKE_INSTALL_DATADIR}")
else() set(abs_plugindir "${MODULE_DESTINATION}")
set(_abs_confdir "${CMAKE_INSTALL_PREFIX}/${_confdir}") if(NOT IS_ABSOLUTE "${abs_prc_install_path}")
set(abs_prc_install_path "${CMAKE_INSTALL_PREFIX}/${abs_prc_install_path}")
endif() endif()
if(CMAKE_INSTALL_DATADIR MATCHES "^/") if(NOT IS_ABSOLUTE "${abs_datadir}")
set(_abs_datadir "${CMAKE_INSTALL_DATADIR}") set(abs_datadir "${CMAKE_INSTALL_PREFIX}/${abs_datadir}")
else()
set(_abs_datadir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}")
endif() endif()
if(NOT IS_ABSOLUTE "${abs_plugindir}")
set(abs_plugindir "${CMAKE_INSTALL_PREFIX}/${abs_plugindir}")
endif()
file(RELATIVE_PATH PLUGINS_PATH
"${abs_prc_install_path}" "${abs_plugindir}")
file(RELATIVE_PATH MODELS_PARENT_PATH file(RELATIVE_PATH MODELS_PARENT_PATH
"${_abs_confdir}" "${_abs_datadir}/panda3d") "${abs_prc_install_path}" "${abs_datadir}/panda3d")
configure_file(panda.prc.in "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc.install") configure_file(panda.prc.in "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc.install")
file(GENERATE OUTPUT "${_out_path}/20_panda.prc" file(GENERATE OUTPUT "${prc_build_path}/20_panda.prc"
INPUT "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc") INPUT "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc")
file(GENERATE OUTPUT "${_out_path}/20_panda.prc.install" file(GENERATE OUTPUT "${prc_build_path}/20_panda.prc.install"
INPUT "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc.install") INPUT "${CMAKE_CURRENT_BINARY_DIR}/20_panda.prc.install")
install(FILES "${_out_path}/20_panda.prc.install" RENAME "20_panda.prc" install(FILES "${prc_build_path}/20_panda.prc.install" RENAME "20_panda.prc"
COMPONENT Core DESTINATION ${_confdir}) COMPONENT Core DESTINATION ${prc_install_path})

2
panda/src/configfiles/panda.prc.in
View File

@ -2,7 +2,7 @@
################################# DO NOT EDIT ########################### ################################# DO NOT EDIT ###########################
# Some paths first... # Some paths first...
plugin-path $THIS_PRC_DIR/${ETC_PARENT_PATH}/lib plugin-path $THIS_PRC_DIR/${PLUGINS_PATH}
model-path $MAIN_DIR model-path $MAIN_DIR
model-path $THIS_PRC_DIR/${MODELS_PARENT_PATH} model-path $THIS_PRC_DIR/${MODELS_PARENT_PATH}
model-path $THIS_PRC_DIR/${MODELS_PARENT_PATH}/models model-path $THIS_PRC_DIR/${MODELS_PARENT_PATH}/models