Merge #97: cmake: rename new packages and module introduced in #95 and #96

c6a1d7f cmake: rename new packages and module introduced in #95 and #96 (Ryan Ofsky)

Pull request description:

  Rename "LibmultiprocessMacros.cmake" module introduced in #95 to "TargetCapnpSources.cmake" to match the name of the `target_capnp_sources` function it contains. Also install it to:

  ```sh
    <prefix>/lib/cmake/Libmultiprocess/TargetCapnpSources.cmake
  ```

  instead of:

  ```sh
    <prefix>/lib/cmake/LibmultiprocessGen/LibmultiprocessMacros.cmake
  ```

  Rename the "Libmultiprocess" and "LibmultiprocessGen" packages introduced in #96 to "LibmultiprocessLib" and "LibmultiprocessBin", so package names are consistent with component names "lib" and "bin", 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 |

Top commit has no ACKs.

Tree-SHA512: db099f34e14f5433c644190359bef0f3b836401b31c8eea3c4f7d732ec06402eb01063360d8b7ebbed9522be9c6758e157e46e15cafd80ac2bebc5c915ad2160

Author: ryanofsky

CMakeLists.txt

@@ -89,24 +89,24 @@ target_link_libraries(multiprocess PRIVATE CapnProto::kj)
 target_link_libraries(multiprocess PRIVATE CapnProto::kj-async)
 set_target_properties(multiprocess PROPERTIES
     PUBLIC_HEADER "${MP_PUBLIC_HEADERS}")
-install(TARGETS multiprocess EXPORT LibmultiprocessTargets
+install(TARGETS multiprocess EXPORT LibTargets
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mp COMPONENT lib)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libmultiprocess.pc"
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT lib)
-install(EXPORT LibmultiprocessTargets
+install(EXPORT LibTargets
   NAMESPACE Libmultiprocess::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT lib)
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
-  ${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessConfig.cmake.in
-  LibmultiprocessConfig.cmake
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess
+  ${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessLibConfig.cmake.in
+  LibmultiprocessLibConfig.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
   NO_SET_AND_CHECK_MACRO)
 install(
   FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessConfig.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT lib)
+    ${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessLibConfig.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake COMPONENT lib)
 add_custom_target(install-lib
   COMMAND ${CMAKE_COMMAND} -DCOMPONENT=lib -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
   VERBATIM)
@@ -125,25 +125,28 @@ set_target_properties(mpgen PROPERTIES
     INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_target_properties(mpgen PROPERTIES
     PUBLIC_HEADER include/mp/proxy.capnp)
-install(TARGETS mpgen EXPORT LibmultiprocessGenTargets
+install(TARGETS mpgen EXPORT BinTargets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mp COMPONENT bin)
 install(FILES "include/mpgen.mk"
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT bin)
-install(EXPORT LibmultiprocessGenTargets
+install(EXPORT BinTargets
   NAMESPACE Libmultiprocess::
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen COMPONENT bin)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT bin)
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
-  ${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessGenConfig.cmake.in
-  LibmultiprocessGenConfig.cmake
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen
+  ${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessBinConfig.cmake.in
+  LibmultiprocessBinConfig.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
   NO_SET_AND_CHECK_MACRO)
 install(
   FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessGenConfig.cmake
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibmultiprocessGen COMPONENT bin)
+    ${CMAKE_CURRENT_BINARY_DIR}/LibmultiprocessBinConfig.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake COMPONENT bin)
+install(
+  FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Libmultiprocess COMPONENT bin)
 add_custom_target(install-bin
   COMMAND ${CMAKE_COMMAND} -DCOMPONENT=bin -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
   VERBATIM)

cmake/LibmultiprocessBinConfig.cmake.in

@@ -0,0 +1,6 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/BinTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/TargetCapnpSources.cmake")
+
+check_required_components(LibmultiprocessBin)

cmake/LibmultiprocessConfig.cmake.in

@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(CapnProto)
+
+include("${CMAKE_CURRENT_LIST_DIR}/Libmultiprocess/LibTargets.cmake")
+
+check_required_components(LibmultiprocessLib)

cmake/LibmultiprocessGenConfig.cmake.in

@@ -2,7 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-include(${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake)
 
 add_executable(mpcalculator
   calculator.cpp

cmake/LibmultiprocessLibConfig.cmake.in

@@ -23,7 +23,7 @@ if(BUILD_TESTING AND TARGET CapnProto::kj-test)
     mp/test/foo.h
     mp/test/test.cpp
   )
-  include(${PROJECT_SOURCE_DIR}/cmake/LibmultiprocessMacros.cmake)
+  include(${PROJECT_SOURCE_DIR}/cmake/TargetCapnpSources.cmake)
   target_capnp_sources(mptest ${CMAKE_CURRENT_SOURCE_DIR} mp/test/foo.capnp
     IMPORT_PATHS ${CMAKE_SOURCE_DIR}/include
   )