Skip to content

Commit a48f17d

Browse files
bluekyubluekyu
committed
Fix incorrect target id.
1 parent 753ce2e commit a48f17d

File tree

18 files changed

+103
-120
lines changed

18 files changed

+103
-120
lines changed

‎cmake/plugin_install.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
install(TARGETS ${PROJECT_NAME} DESTINATION ${RPPLUGIN_INSTALL_DIR})
2-
install(TARGETS ${RPPLUGIN_INTERFACE_TARGET} EXPORT ${TARGET_EXPORT_NAME})
2+
install(TARGETS ${RPPLUGIN_ID} EXPORT ${TARGET_EXPORT_NAME})
33

44
install(DIRECTORY "${PROJECT_SOURCE_DIR}/resources/" DESTINATION ${RPPLUGIN_INSTALL_DIR})
55
if(EXISTS "${PROJECT_SOURCE_DIR}/include")

‎src/rpplugins/ao/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/bloom/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/clouds/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/color_correction/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -61,15 +61,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
6161
)
6262

6363
# create plugin interface target
64-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
65-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
64+
add_library(${RPPLUGIN_ID} INTERFACE)
6665

67-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
66+
target_include_directories(${RPPLUGIN_ID}
6867
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6968
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
7069
)
7170

72-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
71+
target_link_libraries(${RPPLUGIN_ID}
7372
INTERFACE render_pipeline
7473
)
7574

@@ -91,8 +90,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
9190
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
9291
)
9392

94-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
95-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
93+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
94+
export(TARGETS ${RPPLUGIN_ID}
9695
NAMESPACE ${TARGET_NAMESPACE}
9796
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9897
)

‎src/rpplugins/dof/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/env_probes/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -62,15 +62,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
6262
)
6363

6464
# create plugin interface target
65-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
66-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
65+
add_library(${RPPLUGIN_ID} INTERFACE)
6766

68-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
67+
target_include_directories(${RPPLUGIN_ID}
6968
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
7069
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
7170
)
7271

73-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
72+
target_link_libraries(${RPPLUGIN_ID}
7473
INTERFACE render_pipeline
7574
)
7675

@@ -92,8 +91,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
9291
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
9392
)
9493

95-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
96-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
94+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
95+
export(TARGETS ${RPPLUGIN_ID}
9796
NAMESPACE ${TARGET_NAMESPACE}
9897
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9998
)

‎src/rpplugins/forward_shading/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/motion_blur/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -53,15 +53,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
5353
)
5454

5555
# create plugin interface target
56-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
57-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
56+
add_library(${RPPLUGIN_ID} INTERFACE)
5857

59-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
58+
target_include_directories(${RPPLUGIN_ID}
6059
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
6160
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
6261
)
6362

64-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
63+
target_link_libraries(${RPPLUGIN_ID}
6564
INTERFACE render_pipeline
6665
)
6766

@@ -83,8 +82,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
8382
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
8483
)
8584

86-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
87-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
85+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
86+
export(TARGETS ${RPPLUGIN_ID}
8887
NAMESPACE ${TARGET_NAMESPACE}
8988
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
9089
)

‎src/rpplugins/openvr/CMakeLists.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 3.6)
55

66
get_filename_component(RPPLUGIN_ID ${CMAKE_CURRENT_LIST_DIR} NAME)
7-
project(${RPPLUGIN_ID})
7+
project(rpplugin_${RPPLUGIN_ID})
88

99
# === configure ====================================================================================
1010
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Project Grouping
@@ -63,15 +63,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
6363
)
6464

6565
# create plugin interface target
66-
set(RPPLUGIN_INTERFACE_TARGET ${RPPLUGIN_ID}_interface)
67-
add_library(${RPPLUGIN_INTERFACE_TARGET} INTERFACE)
66+
add_library(${RPPLUGIN_ID} INTERFACE)
6867

69-
target_include_directories(${RPPLUGIN_INTERFACE_TARGET}
68+
target_include_directories(${RPPLUGIN_ID}
7069
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
7170
$<INSTALL_INTERFACE:${RPPLUGIN_INSTALL_DIR}/include>
7271
)
7372

74-
target_link_libraries(${RPPLUGIN_INTERFACE_TARGET}
73+
target_link_libraries(${RPPLUGIN_ID}
7574
INTERFACE render_pipeline
7675
)
7776

@@ -93,8 +92,8 @@ configure_package_config_file(${RPPLUGIN_CONFIG_IN_FILE}
9392
INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR}
9493
)
9594

96-
add_library(${TARGET_NAMESPACE}${PROJECT_NAME} ALIAS ${RPPLUGIN_INTERFACE_TARGET})
97-
export(TARGETS ${RPPLUGIN_INTERFACE_TARGET}
95+
add_library(${TARGET_NAMESPACE}${RPPLUGIN_ID} ALIAS ${RPPLUGIN_ID})
96+
export(TARGETS ${RPPLUGIN_ID}
9897
NAMESPACE ${TARGET_NAMESPACE}
9998
FILE "${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake"
10099
)

0 commit comments

Comments
 (0)