From b634585d57bd2f871df03e57254fdf256cfabb28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= <correoricky@gmail.com>
Date: Thu, 29 Nov 2018 10:24:15 +0100
Subject: [PATCH 1/2] Refs #3541. Fixed error creating installer for a topper
 product.

---
 src/cpp/CMakeLists.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 1b09d3e9..14747c99 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -126,13 +126,15 @@ if(UNIX AND EPROSIMA_INSTALLER)
 endif()
 
 # Install libraries
-if(MSVC OR MSVC_IDE AND EPROSIMA_INSTALLER AND IS_TOP_LEVEL)
-    install_msvc_libraries(i86Win32VS2013)
-    install_msvc_libraries(x64Win64VS2013)
-    install_msvc_libraries(i86Win32VS2015)
-    install_msvc_libraries(x64Win64VS2015)
-    install_msvc_libraries(i86Win32VS2017)
-    install_msvc_libraries(x64Win64VS2017)
+if(MSVC OR MSVC_IDE AND EPROSIMA_INSTALLER)
+    if(IS_TOP_LEVEL)
+        install_msvc_libraries(i86Win32VS2013)
+        install_msvc_libraries(x64Win64VS2013)
+        install_msvc_libraries(i86Win32VS2015)
+        install_msvc_libraries(x64Win64VS2015)
+        install_msvc_libraries(i86Win32VS2017)
+        install_msvc_libraries(x64Win64VS2017)
+    endif()
 
     install(FILES ${PROJECT_SOURCE_DIR}/cmake/packaging/windows/${PROJECT_NAME}-config.cmake
         DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/cmake

From f9e485ece48b5c0aa90f7458c110de26ef99ec1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= <correoricky@gmail.com>
Date: Thu, 29 Nov 2018 10:26:12 +0100
Subject: [PATCH 2/2] Refs #3541. Fixed error generation installer.

---
 cmake/dev/generate_msvc_libraries.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/dev/generate_msvc_libraries.cmake b/cmake/dev/generate_msvc_libraries.cmake
index f8d34c35..c0d7eb48 100644
--- a/cmake/dev/generate_msvc_libraries.cmake
+++ b/cmake/dev/generate_msvc_libraries.cmake
@@ -71,8 +71,8 @@ macro(install_msvc_libraries platform)
         COMPONENT libraries_${platform}
         )
 
-    install(DIRECTORY ${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install/${DATA_INSTALL_DIR}/${PROJECT_NAME}/cmake
-        DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+    install(DIRECTORY ${PROJECT_BINARY_DIR}/eprosima_installer/${platform}/install/${DATA_INSTALL_DIR}/
+        DESTINATION ${DATA_INSTALL_DIR}
         COMPONENT cmake
         )