Skip to content

Commit 7e36574

Browse files
Mario-DLmergify[bot]
authored andcommitted
Change xsd files installation directory to share/fastdds and remove icons on windows uninstall (#5140)
* Refs #21366: Change xsd installation directory to .../share/fastdds Signed-off-by: Mario Dominguez <[email protected]> * TMP commit for testing Signed-off-by: Mario Dominguez <[email protected]> * Refs #21564: Remove redundant installation of xsd file again Signed-off-by: Mario Dominguez <[email protected]> * Refs #21564: Change expected xsd installation path Signed-off-by: Mario Dominguez <[email protected]> * Revert "TMP commit for testing" This reverts commit ac18b8a. --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit 6bb7e9a)
1 parent ce5a2a1 commit 7e36574

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -579,12 +579,12 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE
579579

580580
# Install xml validators
581581
install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_profiles.xsd
582-
DESTINATION ${DATA_INSTALL_DIR}
582+
DESTINATION ${DATA_INSTALL_DIR}/fastdds
583583
COMPONENT xsd
584584
)
585585

586586
install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_static_discovery.xsd
587-
DESTINATION ${DATA_INSTALL_DIR}
587+
DESTINATION ${DATA_INSTALL_DIR}/fastdds
588588
COMPONENT xsd
589589
)
590590

tools/fastdds/xml_ci/parser.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ def xsd_dir(self):
108108
"""
109109
tool_path = Path(os.path.dirname(os.path.realpath(__file__)))
110110
# We assume the schema path is relative to our installation path
111-
return tool_path / '../../../share/fastdds_profiles.xsd'
111+
return tool_path / '../../../share/fastdds/fastdds_profiles.xsd'

tools/fds/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,6 @@ install(EXPORT ${PROJECT_NAME}-targets
101101
COMPONENT cmake
102102
)
103103

104-
# export xsd schema
105-
install(FILES ../../resources/xsd/fastdds_profiles.xsd
106-
DESTINATION ${DATA_INSTALL_DIR}
107-
COMPONENT cmake
108-
)
109-
110104
# symlink creation requires:
111105
# - install( CODE using generator expressions (legacy code is provided for all cmake versions)
112106
# - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)

0 commit comments

Comments
 (0)