Change xsd files installation directory to share/fastdds and remo…

…ve icons on windows uninstall (#5140) (#5302) * 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) Co-authored-by: Mario Domínguez López <[email protected]>
eProsima · Oct 7, 2024 · 25f12b5 · 25f12b5
1 parent b86bb87
commit 25f12b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -579,12 +579,12 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE
 
 # Install xml validators
 install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_profiles.xsd
-    DESTINATION ${DATA_INSTALL_DIR}
+    DESTINATION ${DATA_INSTALL_DIR}/fastdds
     COMPONENT xsd
     )
 
 install(FILES ${PROJECT_SOURCE_DIR}/resources/xsd/fastdds_static_discovery.xsd
-    DESTINATION ${DATA_INSTALL_DIR}
+    DESTINATION ${DATA_INSTALL_DIR}/fastdds
     COMPONENT xsd
     )
 

diff --git a/tools/fastdds/xml_ci/parser.py b/tools/fastdds/xml_ci/parser.py
@@ -108,4 +108,4 @@ def xsd_dir(self):
         """
         tool_path = Path(os.path.dirname(os.path.realpath(__file__)))
         # We assume the schema path is relative to our installation path
-        return tool_path / '../../../share/fastdds_profiles.xsd'
+        return tool_path / '../../../share/fastdds/fastdds_profiles.xsd'
diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt
@@ -101,12 +101,6 @@ install(EXPORT ${PROJECT_NAME}-targets
         COMPONENT cmake
         )
 
-# export xsd schema
-install(FILES ../../resources/xsd/fastdds_profiles.xsd
-        DESTINATION ${DATA_INSTALL_DIR}
-        COMPONENT cmake
-        )
-
 # symlink creation requires:
 #   - install( CODE using generator expressions (legacy code is provided for all cmake versions)
 #   - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)