Ensuring all export sets are using ${PROJECT_NAME}-exports

nv-morpheus · Dec 22, 2023 · cfce3d8 · cfce3d8
1 parent d12e95e
commit cfce3d8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -24,8 +24,8 @@ morpheus_utils_initialize_cpm(MRC_CACHE_DIR)
 # Start with CUDA. Need to add it to our export set
 rapids_find_package(CUDAToolkit
   REQUIRED
-  BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-  INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
+  BUILD_EXPORT_SET ${PROJECT_NAME}-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-exports
 )
 
 # Boost
@@ -48,8 +48,8 @@ morpheus_utils_configure_rmm()
 # ======
 rapids_find_package(gflags REQUIRED
   GLOBAL_TARGETS gflags
-  BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-  INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
+  BUILD_EXPORT_SET ${PROJECT_NAME}-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-exports
 )
 
 # glog
@@ -72,8 +72,8 @@ rapids_find_package(gRPC REQUIRED
   gRPC::address_sorting gRPC::gpr gRPC::grpc gRPC::grpc_unsecure gRPC::grpc++ gRPC::grpc++_alts gRPC::grpc++_error_details gRPC::grpc++_reflection
   gRPC::grpc++_unsecure gRPC::grpc_plugin_support gRPC::grpcpp_channelz gRPC::upb gRPC::grpc_cpp_plugin gRPC::grpc_csharp_plugin gRPC::grpc_node_plugin
   gRPC::grpc_objective_c_plugin gRPC::grpc_php_plugin gRPC::grpc_python_plugin gRPC::grpc_ruby_plugin
-  BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-  INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
+  BUILD_EXPORT_SET ${PROJECT_NAME}-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-exports
 )
 
 # RxCpp
@@ -84,8 +84,8 @@ morpheus_utils_configure_rxcpp()
 # ======
 rapids_find_package(nlohmann_json REQUIRED
   GLOBAL_TARGETS nlohmann_json::nlohmann_json
-  BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
-  INSTALL_EXPORT_SET ${PROJECT_NAME}-core-exports
+  BUILD_EXPORT_SET ${PROJECT_NAME}-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-exports
   FIND_ARGS
   CONFIG
 )
@@ -103,7 +103,7 @@ if(MRC_BUILD_BENCHMARKS)
   # ================
   rapids_find_package(benchmark REQUIRED
     GLOBAL_TARGETS benchmark::benchmark
-    BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
+    BUILD_EXPORT_SET ${PROJECT_NAME}-exports
 
     # No install set
     FIND_ARGS
@@ -116,7 +116,7 @@ if(MRC_BUILD_TESTS)
   # ===========
   rapids_find_package(GTest REQUIRED
     GLOBAL_TARGETS GTest::gtest GTest::gmock GTest::gtest_main GTest::gmock_main
-    BUILD_EXPORT_SET ${PROJECT_NAME}-core-exports
+    BUILD_EXPORT_SET ${PROJECT_NAME}-exports
 
     # No install set
     FIND_ARGS

diff --git a/cpp/mrc/CMakeLists.txt b/cpp/mrc/CMakeLists.txt
@@ -212,7 +212,7 @@ include(GNUInstallDirs)
 install(
   TARGETS libmrc
   DESTINATION ${lib_dir}
-  EXPORT ${PROJECT_NAME}-core-exports
+  EXPORT ${PROJECT_NAME}-exports
   COMPONENT Core
 )
 
@@ -250,7 +250,7 @@ set(rapids_project_version_compat SameMinorVersion)
 # Need to explicitly set VERSION ${PROJECT_VERSION} here since rapids_cmake gets
 # confused with the `RAPIDS_VERSION` variable we use
 rapids_export(INSTALL ${PROJECT_NAME}
-  EXPORT_SET ${PROJECT_NAME}-core-exports
+  EXPORT_SET ${PROJECT_NAME}-exports
   GLOBAL_TARGETS libmrc
   VERSION ${PROJECT_VERSION}
   NAMESPACE mrc::
@@ -261,7 +261,7 @@ rapids_export(INSTALL ${PROJECT_NAME}
 # ##################################################################################################
 # - build export ----------------------------------------------------------------------------------
 rapids_export(BUILD ${PROJECT_NAME}
-  EXPORT_SET ${PROJECT_NAME}-core-exports
+  EXPORT_SET ${PROJECT_NAME}-exports
   GLOBAL_TARGETS libmrc
   VERSION ${PROJECT_VERSION}
   LANGUAGES C CXX CUDA

diff --git a/external/utilities b/external/utilities
diff --git a/protos/CMakeLists.txt b/protos/CMakeLists.txt
@@ -93,7 +93,7 @@ add_dependencies(${PROJECT_NAME}_style_checks mrc_protos-headers-target)
 
 install(
   TARGETS mrc_protos mrc_architect_protos
-  EXPORT ${PROJECT_NAME}-core-exports
+  EXPORT ${PROJECT_NAME}-exports
   PUBLIC_HEADER
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/protos"
 )

diff --git a/python/mrc/_pymrc/CMakeLists.txt b/python/mrc/_pymrc/CMakeLists.txt
@@ -73,7 +73,7 @@ rapids_cmake_install_lib_dir(lib_dir)
 install(
   TARGETS pymrc
   DESTINATION ${lib_dir}
-  EXPORT ${PROJECT_NAME}-core-exports
+  EXPORT ${PROJECT_NAME}-exports
   COMPONENT Python
 )
+46 −0		cmake/morpheus_utils/environment_config/rapids_cmake/register_api.cmake
+61 −45		cmake/morpheus_utils/general/debug/cmake_project_debug.cmake
+9 −9		cmake/morpheus_utils/package_config/boost/Configure_boost.cmake
+2 −2		cmake/morpheus_utils/package_config/expected/Configure_expected.cmake
+2 −2		cmake/morpheus_utils/package_config/glog/Configure_glog.cmake
+4 −4		cmake/morpheus_utils/package_config/hwloc/Configure_hwloc.cmake
+2 −2		cmake/morpheus_utils/package_config/libcudacxx/Configure_libcudacxx.cmake
+2 −2		cmake/morpheus_utils/package_config/prometheus/Configure_prometheus.cmake
+2 −2		cmake/morpheus_utils/package_config/pybind11/Configure_pybind11.cmake
+2 −2		cmake/morpheus_utils/package_config/rmm/Configure_rmm.cmake
+2 −2		cmake/morpheus_utils/package_config/rxcpp/Configure_rxcpp.cmake
+2 −2		cmake/morpheus_utils/package_config/taskflow/Configure_taskflow.cmake
+5 −5		cmake/morpheus_utils/package_config/ucx/Configure_ucx.cmake