Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes when other product create its installer #34

Merged
merged 2 commits into from
Nov 29, 2018
Merged

Fixes when other product create its installer #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b634585
Refs #3541. Fixed error creating installer for a topper product.
richiware Nov 29, 2018
f9e485e
Refs #3541. Fixed error generation installer.
richiware Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/dev/generate_msvc_libraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
16 changes: 9 additions & 7 deletions src/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down