Skip to content

Commit 2d92a92

Browse files
bluekyubluekyu
committed
Update CMake files.
- Fix export funciton. - Change installed path of 'config' directory.
1 parent bbcc14a commit 2d92a92

File tree

23 files changed

+61
-105
lines changed

23 files changed

+61
-105
lines changed

‎CMakeLists.txt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ include(FindPackages)
3535
set(render_pipeline_SETTING_CMAKE_FILE "${PROJECT_SOURCE_DIR}/cmake/render_pipeline-setting.cmake")
3636
include(${render_pipeline_SETTING_CMAKE_FILE})
3737

38-
# subdirectory
39-
add_subdirectory("${PROJECT_SOURCE_DIR}/src/rpplugins")
40-
4138
# === project specific packages ===
4239
# find spdlog
4340
if(NOT TARGET spdlog::spdlog)
@@ -97,9 +94,7 @@ set(PACKAGE_VERSION "${PROJECT_VERSION}")
9794
set(PACKAGE_VERSION_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake")
9895
set(PACKAGE_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake")
9996
set(TARGET_EXPORT_NAME "${PACKAGE_NAME}-targets")
100-
set(PACKAGE_CMAKE_INSTALL_DIR "lib/${PROJECT_NAME}/cmake")
101-
file(RELATIVE_PATH PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${PACKAGE_CMAKE_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
102-
get_filename_component(PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR "${PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR}/." DIRECTORY)
97+
set(PACKAGE_CMAKE_INSTALL_DIR "lib/cmake/${PACKAGE_NAME}")
10398

10499
include(CMakePackageConfigHelpers)
105100
write_basic_package_version_file(${PACKAGE_VERSION_CONFIG_FILE}
@@ -111,28 +106,26 @@ configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/${PACKAGE_NAME}-confi
111106
${PACKAGE_CONFIG_FILE}
112107
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
113108
)
114-
115-
export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake)
116-
export(PACKAGE ${PACKAGE_NAME})
117109
# ==================================================================================================
118110

119111
# === install ======================================================================================
120-
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${PROJECT_NAME})
112+
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${PACKAGE_NAME})
121113

122114
install(TARGETS ${PROJECT_NAME}
123115
EXPORT ${TARGET_EXPORT_NAME}
124116
RUNTIME DESTINATION "bin"
125117
LIBRARY DESTINATION "lib"
126118
ARCHIVE DESTINATION "lib"
127119
)
120+
export(EXPORT ${TARGET_EXPORT_NAME} FILE ${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake)
128121

129122
install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}.pdb"
130123
DESTINATION "bin"
131124
CONFIGURATIONS Debug RelWithDebInfo
132125
)
133126

134127
install(DIRECTORY "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}" DESTINATION "include/")
135-
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/config/" DESTINATION "${render_pipeline_CONFIG_DIR}/")
128+
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/config" DESTINATION "${render_pipeline_DATA_DIR}/")
136129
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/data" DESTINATION "${render_pipeline_DATA_DIR}/")
137130
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/effects" DESTINATION "${render_pipeline_DATA_DIR}/")
138131
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/rpcore" DESTINATION "${render_pipeline_DATA_DIR}/")
@@ -161,4 +154,10 @@ endif()
161154
install(FILES
162155
"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md"
163156
DESTINATION "share/${PROJECT_NAME}/")
157+
158+
export(PACKAGE ${PACKAGE_NAME})
159+
# ==================================================================================================
160+
161+
# === subdirectory =================================================================================
162+
add_subdirectory("${PROJECT_SOURCE_DIR}/src/rpplugins")
164163
# ==================================================================================================

‎cmake/FindPackages.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _find_boost("filesystem")
3030

3131
if(NOT TARGET panda3d::panda3d)
3232
# find panda3d
33-
set(PANDA3D_ROOT "" CACHE PATH "Hint for finding panda3d root directory")
33+
set(panda3d_ROOT "" CACHE PATH "Hint for finding panda3d root directory")
3434
find_package(panda3d REQUIRED)
3535
endif()
3636

‎cmake/plugin_install.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
install(TARGETS ${PROJECT_NAME} DESTINATION ${RPPLUGIN_INSTALL_DIR})
22
install(TARGETS ${RPPLUGIN_ID} EXPORT ${TARGET_EXPORT_NAME})
3+
export(EXPORT ${TARGET_EXPORT_NAME}
4+
NAMESPACE ${TARGET_NAMESPACE}
5+
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
6+
)
37

48
install(FILES "${PROJECT_SOURCE_DIR}/config.yaml" DESTINATION ${RPPLUGIN_INSTALL_DIR})
59
foreach(directory_name "include" "resources" "shader")
@@ -10,3 +14,5 @@ endforeach()
1014

1115
install(FILES ${PACKAGE_CONFIG_FILE} ${PACKAGE_VERSION_CONFIG_FILE} DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR})
1216
install(EXPORT ${TARGET_EXPORT_NAME} NAMESPACE ${TARGET_NAMESPACE} DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR})
17+
18+
export(PACKAGE ${PACKAGE_NAME})

‎cmake/render_pipeline-config.cmake.in‎

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

3-
set (@PACKAGE_NAME@_VERSION "@PACKAGE_VERSION@")
3+
set(@PACKAGE_NAME@_VERSION "@PACKAGE_VERSION@")
44

55
include(${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT_NAME@.cmake)
66
include(${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@-setting.cmake)
77

8-
set(@PACKAGE_NAME@_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR@")
8+
set(@PACKAGE_NAME@_INSTALL_DIR ${PACKAGE_PREIFX_DIR})
99

1010
message(STATUS "@PACKAGE_NAME@ version: ${@PACKAGE_NAME@_VERSION}")
1111

‎cmake/render_pipeline-setting.cmake‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
set(render_pipeline_CONFIG_DIR "etc/render_pipeline")
1+
# render pipeline setting
22
set(render_pipeline_DATA_DIR "share/render_pipeline")
33
set(render_pipeline_PLUGIN_DIR "${render_pipeline_DATA_DIR}/rpplugins")
44

5-
# help function to find plugin
5+
# help function to find rpplugin
66
function(render_pipeline_FIND_PLUGINS plugin_id_list)
77
set(missed_plugin_id_list "")
88
foreach(plugin_id ${plugin_id_list})
@@ -14,8 +14,6 @@ function(render_pipeline_FIND_PLUGINS plugin_id_list)
1414
if(missed_plugin_id_list)
1515
if(render_pipeline_INSTALL_DIR)
1616
set(PLUGIN_DIR_HINT "${render_pipeline_INSTALL_DIR}/${render_pipeline_PLUGIN_DIR}")
17-
else()
18-
message(WARNING "render_pipeline_INSTALL_DIR is NOT set.")
1917
endif()
2018

2119
foreach(plugin_id ${missed_plugin_id_list})

‎src/rpplugins/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ cmake_minimum_required(VERSION 3.6)
77
# common variable
88
set(RPPLUGIN_CONFIG_IN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpplugin-config.cmake.in")
99

10-
set(RENDER_PIPELINE_PLUGINS "ao" "bloom" "clouds" "color_correction" "dof" "env_probes" "forward_shading"
11-
"motion_blur" "pssm" "scattering" "skin_shading" "sky_ao" "smaa" "ssr" "volumetrics" "vxgi"
10+
set(RENDER_PIPELINE_PLUGINS "ao" "bloom" "clouds" "color_correction" "dof" "forward_shading"
11+
"motion_blur" "volumetrics" "scattering" "pssm" "env_probes" "skin_shading" "sky_ao" "smaa"
12+
"ssr" "vxgi"
1213
)
1314

1415
# optional plugin

‎src/rpplugins/ao/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ target_link_libraries(${PROJECT_NAME}
5050
set_target_properties(${PROJECT_NAME} PROPERTIES
5151
FOLDER "render_pipeline/rpplugins"
5252
)
53+
# ==================================================================================================
5354

55+
# === target =======================================================================================
5456
# create plugin interface target
5557
add_library(${RPPLUGIN_ID} INTERFACE)
5658

@@ -82,11 +84,6 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8284
)
8385

8486
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
85-
export(TARGETS ${RPPLUGIN_ID}
86-
NAMESPACE ${TARGET_NAMESPACE}
87-
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
88-
)
89-
export(PACKAGE ${PACKAGE_NAME})
9087
# ==================================================================================================
9188

9289
# === install ======================================================================================

‎src/rpplugins/bloom/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ target_link_libraries(${PROJECT_NAME}
5050
set_target_properties(${PROJECT_NAME} PROPERTIES
5151
FOLDER "render_pipeline/rpplugins"
5252
)
53+
# ==================================================================================================
5354

55+
# === target =======================================================================================
5456
# create plugin interface target
5557
add_library(${RPPLUGIN_ID} INTERFACE)
5658

@@ -82,11 +84,6 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8284
)
8385

8486
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
85-
export(TARGETS ${RPPLUGIN_ID}
86-
NAMESPACE ${TARGET_NAMESPACE}
87-
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
88-
)
89-
export(PACKAGE ${PACKAGE_NAME})
9087
# ==================================================================================================
9188

9289
# === install ======================================================================================

‎src/rpplugins/clouds/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ target_link_libraries(${PROJECT_NAME}
5050
set_target_properties(${PROJECT_NAME} PROPERTIES
5151
FOLDER "render_pipeline/rpplugins"
5252
)
53+
# ==================================================================================================
5354

55+
# === target =======================================================================================
5456
# create plugin interface target
5557
add_library(${RPPLUGIN_ID} INTERFACE)
5658

@@ -82,11 +84,6 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8284
)
8385

8486
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
85-
export(TARGETS ${RPPLUGIN_ID}
86-
NAMESPACE ${TARGET_NAMESPACE}
87-
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
88-
)
89-
export(PACKAGE ${PACKAGE_NAME})
9087
# ==================================================================================================
9188

9289
# === install ======================================================================================

‎src/rpplugins/color_correction/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ target_link_libraries(${PROJECT_NAME}
5858
set_target_properties(${PROJECT_NAME} PROPERTIES
5959
FOLDER "render_pipeline/rpplugins"
6060
)
61+
# ==================================================================================================
6162

63+
# === target =======================================================================================
6264
# create plugin interface target
6365
add_library(${RPPLUGIN_ID} INTERFACE)
6466

@@ -90,11 +92,6 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
9092
)
9193

9294
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
93-
export(TARGETS ${RPPLUGIN_ID}
94-
NAMESPACE ${TARGET_NAMESPACE}
95-
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
96-
)
97-
export(PACKAGE ${PACKAGE_NAME})
9895
# ==================================================================================================
9996

10097
# === install ======================================================================================

0 commit comments

Comments
 (0)