From c8f3e5b8912cee5d37f1a9bb62c7e74407fc1bf1 Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:52:14 +0100 Subject: [PATCH] Change windows file names (#4576) * Refs #20390: Change fastdds-config.cmake name Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20390: Change fastdds.manifest.in name Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- .../windows/{fastrtps-config.cmake => fastdds-config.cmake} | 0 .../windows/{fastrtps.manifest.in => fastdds.manifest.in} | 0 src/cpp/CMakeLists.txt | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename cmake/packaging/windows/{fastrtps-config.cmake => fastdds-config.cmake} (100%) rename cmake/packaging/windows/{fastrtps.manifest.in => fastdds.manifest.in} (100%) diff --git a/cmake/packaging/windows/fastrtps-config.cmake b/cmake/packaging/windows/fastdds-config.cmake similarity index 100% rename from cmake/packaging/windows/fastrtps-config.cmake rename to cmake/packaging/windows/fastdds-config.cmake diff --git a/cmake/packaging/windows/fastrtps.manifest.in b/cmake/packaging/windows/fastdds.manifest.in similarity index 100% rename from cmake/packaging/windows/fastrtps.manifest.in rename to cmake/packaging/windows/fastdds.manifest.in diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 4205e033d5f..12ba05ede58 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -521,12 +521,12 @@ if(MSVC OR MSVC_IDE) # replace the values in the manifest template configure_file( - "${PROJECT_SOURCE_DIR}/cmake/packaging/windows/fastrtps.manifest.in" - "${PROJECT_BINARY_DIR}/fastrtps.manifest" + "${PROJECT_SOURCE_DIR}/cmake/packaging/windows/fastdds.manifest.in" + "${PROJECT_BINARY_DIR}/fastdds.manifest" @ONLY ) - file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/fastrtps.manifest" MANIFEST_FILE_PATH) + file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/fastdds.manifest" MANIFEST_FILE_PATH) target_link_options(${PROJECT_NAME} PRIVATE "/MANIFEST:EMBED" "/MANIFESTINPUT:${MANIFEST_FILE_PATH}") unset(WINDOWS_SOURCE_DIR)