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

[cmake] rename target file consistency #270

Merged
merged 1 commit into from
Jan 15, 2023
Merged

[cmake] rename target file consistency #270

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ write_basic_package_version_file(
"kalman-config-version.cmake" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)

install(
EXPORT kalmanTargets
NAMESPACE kalman::
EXPORT "kalman-target"
NAMESPACE "kalman::"
DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kalman-config.cmake"
Expand Down
2 changes: 1 addition & 1 deletion cmake/kalman-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <https://unlicense.org> ]]

include("${CMAKE_CURRENT_LIST_DIR}/kalmanTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/kalman-target.cmake")
9 changes: 4 additions & 5 deletions include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,11 @@ target_compile_features(kalman INTERFACE cxx_std_23)
target_link_libraries(kalman INTERFACE $<$<NOT:$<BOOL:${WIN32}>>:kalman_format>)
install(
TARGETS kalman
EXPORT kalmanTargets
FILE_SET "kalman_headers"
DESTINATION "include")
EXPORT "kalman-target"
FILE_SET "kalman_headers")
install(
EXPORT kalmanTargets
NAMESPACE kalman::
EXPORT "kalman-target"
NAMESPACE "kalman::"
DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")

# Conditionally provide the namespace alias target which may be an imported
Expand Down
6 changes: 3 additions & 3 deletions support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ else()
target_link_libraries(kalman_format INTERFACE fmt::fmt)
install(
TARGETS kalman_format
EXPORT kalmanTargets
EXPORT "kalman-target"
FILE_SET "kalman_format_headers"
DESTINATION "include/fcarouge")
install(
EXPORT kalmanTargets
NAMESPACE kalman::
EXPORT "kalman-target"
NAMESPACE "kalman::"
DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")
endif()