Skip to content

Commit f3731a2

Browse files
committed
Fix package setting for variables.
1 parent 2d92a92 commit f3731a2

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ message("Render Pipeline building version: ${render_pipeline_VERSION}")
3232
# configure project package
3333
include(FindPackages)
3434

35-
set(render_pipeline_SETTING_CMAKE_FILE "${PROJECT_SOURCE_DIR}/cmake/render_pipeline-setting.cmake")
36-
include(${render_pipeline_SETTING_CMAKE_FILE})
35+
set(render_pipeline_MACRO_CMAKE_FILE "${PROJECT_SOURCE_DIR}/cmake/render_pipeline-macro.cmake")
36+
include(${render_pipeline_MACRO_CMAKE_FILE})
3737

3838
# === project specific packages ===
3939
# find spdlog
@@ -130,7 +130,7 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/data" DESTINATION "${render_p
130130
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/effects" DESTINATION "${render_pipeline_DATA_DIR}/")
131131
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/rpcore" DESTINATION "${render_pipeline_DATA_DIR}/")
132132

133-
install(FILES ${PACKAGE_CONFIG_FILE} ${PACKAGE_VERSION_CONFIG_FILE} ${render_pipeline_SETTING_CMAKE_FILE}
133+
install(FILES ${PACKAGE_CONFIG_FILE} ${PACKAGE_VERSION_CONFIG_FILE} ${render_pipeline_MACRO_CMAKE_FILE}
134134
DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
135135
)
136136
install(EXPORT ${TARGET_EXPORT_NAME} DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR})

cmake/render_pipeline-config.cmake.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
@PACKAGE_INIT@
22

3-
set(@PACKAGE_NAME@_VERSION "@PACKAGE_VERSION@")
3+
include(CMakeFindDependencyMacro)
4+
find_dependency(panda3d)
5+
find_dependency(Boost 1.62.0)
46

57
include(${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT_NAME@.cmake)
6-
include(${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@-setting.cmake)
8+
include(${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@-macro.cmake)
79

10+
set(@PACKAGE_NAME@_VERSION "@PACKAGE_VERSION@")
811
set(@PACKAGE_NAME@_INSTALL_DIR ${PACKAGE_PREIFX_DIR})
912

1013
message(STATUS "@PACKAGE_NAME@ version: ${@PACKAGE_NAME@_VERSION}")
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
# render pipeline setting
2-
set(render_pipeline_DATA_DIR "share/render_pipeline")
3-
set(render_pipeline_PLUGIN_DIR "${render_pipeline_DATA_DIR}/rpplugins")
1+
# render pipeline variable
2+
set(render_pipeline_DATA_DIR "share/render_pipeline" CACHE INTERNAL
3+
"Relative path of data directory in Render Pipeline"
4+
)
5+
set(render_pipeline_PLUGIN_DIR "${render_pipeline_DATA_DIR}/rpplugins" CACHE INTERNAL
6+
"Relative path of plugin directory in Render Pipeline"
7+
)
48

59
# help function to find rpplugin
610
function(render_pipeline_FIND_PLUGINS plugin_id_list)

0 commit comments

Comments
 (0)