Skip to content

Commit c6a1d7f

Browse files
committed
cmake: rename new packages and module introduced in #95 and #96
Rename "LibmultiprocessMacros.cmake" module to "TargetCapnpSources.cmake" to match the name of the target_capnp_sources function it contains. Also install it <prefix>/lib/cmake/Libmultiprocess/TargetCapnpSources.cmake instead of: <prefix>/lib/cmake/LibmultiprocessGen/LibmultiprocessMacros.cmake Rename the "LibmultiprocessGen" package to "LibmultiprocessBin" and rename the "Libmultiprocess" package to "LibmultiprocessLib", so package names are consistent with component names "bin" and "lib", and one package name is not a prefix of the other. Also rename intermediate files to match component names. |----------------+----------------------------------+----------------------------------------------| | | New | Current | |----------------+----------------------------------+----------------------------------------------| | Component name | lib | lib | | Package name | LibmultiprocessLib | Libmultiprocess | | Config file | LibmultiprocessLibConfig.cmake | Libmultiprocess/LibmultiprocessConfig.cmake | | Targets file | Libmultiprocess/LibTargets.cmake | Libmultiprocess/LibmultiprocessTargets.cmake | |----------------+----------------------------------+----------------------------------------------| |----------------+----------------------------------+----------------------------------------------------| | | New | Current | |----------------+----------------------------------+----------------------------------------------------| | Component name | bin | bin | | Package name | LibmultiprocessBin | LibmultiprocessGen | | Config file | LibmultiprocessBinConfig.cmake | LibmultiprocessGen/LibmultiprocessGenConfig.cmake | | Targets file | Libmultiprocess/BinTargets.cmake | LibmultiprocessGen/LibmultiprocessGenTargets.cmake | |----------------+----------------------------------+----------------------------------------------------|
1 parent 003eb04 commit c6a1d7f

8 files changed

+35
-32
lines changed

CMakeLists.txt

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,24 @@ target_link_libraries(multiprocess PRIVATE CapnProto::kj)
8989
target_link_libraries(multiprocess PRIVATE CapnProto::kj-async)
9090
set_target_properties(multiprocess PROPERTIES
9191
PUBLIC_HEADER "${MP_PUBLIC_HEADERS}")
92-
install(TARGETS multiprocess EXPORT LibmultiprocessTargets
92+
install(TARGETS multiprocess EXPORT LibTargets
9393
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
9494
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mp COMPONENT lib)
9595
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libmultiprocess.pc"
9696
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT lib)
97-
install(EXPORT LibmultiprocessTargets
97+
install(EXPORT LibTargets
9898
NAMESPACE Libmultiprocess::
9999
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT lib)
100100
include(CMakePackageConfigHelpers)
101101
configure_package_config_file(
102-
${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessConfig.cmake.in
103-
LibmultiprocessConfig.cmake
104-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess
102+
${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessLibConfig.cmake.in
103+
LibmultiprocessLibConfig.cmake
104+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
105105
NO_SET_AND_CHECK_MACRO)
106106
install(
107107
FILES
108-
${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessConfig.cmake
109-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT lib)
108+
${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessLibConfig.cmake
109+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake COMPONENT lib)
110110
add_custom_target(install-lib
111111
COMMAND ${CMAKE_COMMAND} -DCOMPONENT=lib -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
112112
VERBATIM)
@@ -125,25 +125,28 @@ set_target_properties(mpgen PROPERTIES
125125
INSTALL_RPATH_USE_LINK_PATH TRUE)
126126
set_target_properties(mpgen PROPERTIES
127127
PUBLIC_HEADER include/mp/proxy.capnp)
128-
install(TARGETS mpgen EXPORT LibmultiprocessGenTargets
128+
install(TARGETS mpgen EXPORT BinTargets
129129
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin
130130
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mp COMPONENT bin)
131131
install(FILES "include/mpgen.mk"
132132
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT bin)
133-
install(EXPORT LibmultiprocessGenTargets
133+
install(EXPORT BinTargets
134134
NAMESPACE Libmultiprocess::
135-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen COMPONENT bin)
135+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT bin)
136136
include(CMakePackageConfigHelpers)
137137
configure_package_config_file(
138-
${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessGenConfig.cmake.in
139-
LibmultiprocessGenConfig.cmake
140-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen
138+
${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessBinConfig.cmake.in
139+
LibmultiprocessBinConfig.cmake
140+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
141141
NO_SET_AND_CHECK_MACRO)
142142
install(
143143
FILES
144-
${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessGenConfig.cmake
145-
${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake
146-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen COMPONENT bin)
144+
${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessBinConfig.cmake
145+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake COMPONENT bin)
146+
install(
147+
FILES
148+
${CMAKE_CURRENT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake
149+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT bin)
147150
add_custom_target(install-bin
148151
COMMAND ${CMAKE_COMMAND} -DCOMPONENT=bin -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
149152
VERBATIM)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@PACKAGE_INIT@
2+
3+
include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/BinTargets.cmake")
4+
include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/TargetCapnpSources.cmake")
5+
6+
check_required_components(LibmultiprocessBin)

cmake/LibmultiprocessConfig.cmake.in

Lines changed: 0 additions & 8 deletions
This file was deleted.

cmake/LibmultiprocessGenConfig.cmake.in

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@PACKAGE_INIT@
2+
3+
include(CMakeFindDependencyMacro)
4+
find_dependency(CapnProto)
5+
6+
include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/LibTargets.cmake")
7+
8+
check_required_components(LibmultiprocessLib)
File renamed without changes.

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Distributed under the MIT software license, see the accompanying
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
include(${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake)
5+
include(${PROJECT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake)
66

77
add_executable(mpcalculator
88
calculator.cpp

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(BUILD_TESTING AND TARGET CapnProto::kj-test)
2323
mp/test/foo.h
2424
mp/test/test.cpp
2525
)
26-
include(${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake)
26+
include(${PROJECT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake)
2727
target_capnp_sources(mptest ${CMAKE_CURRENT_SOURCE_DIR} mp/test/foo.capnp
2828
IMPORT_PATHS ${CMAKE_SOURCE_DIR}/include
2929
)

0 commit comments

Comments
 (0)