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

Jump to bottom

Always make idlc_generate available in install #1957

Merged
merged 1 commit into from Mar 28, 2024
Merged

Always make idlc_generate available in install #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -343,6 +343,10 @@ install(
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
COMPONENT dev
)
install(
FILES "${CycloneDDS_SOURCE_DIR}/cmake/Modules/Generate.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/idlc"
COMPONENT dev)

# Generated file paths
# although the following files are generated, they are checked into source
Expand Down
4 changes: 1 addition & 3 deletions PackageConfig.cmake.in
View file
Open in desktop
Expand Up @@ -12,6 +12,4 @@
@PACKAGE_INIT@

include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
if(TARGET CycloneDDS::idlc)
include("${CMAKE_CURRENT_LIST_DIR}/idlc/Generate.cmake")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/idlc/Generate.cmake")
5 changes: 0 additions & 5 deletions src/tools/idlc/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -114,11 +114,6 @@ if (INSTALL_PDB)
)
endif()

install(
FILES "${CycloneDDS_SOURCE_DIR}/cmake/Modules/Generate.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/idlc"
COMPONENT dev)

include("${CycloneDDS_SOURCE_DIR}/cmake/Modules/Generate.cmake")

if(BUILD_TESTING)
Expand Down