Consistently use the nvtx3 name everywhere

rapidsai · May 23, 2024 · f57a5d3 · f57a5d3
1 parent 50c5d93
commit f57a5d3
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/rapids-cmake/cpm/nvtx3.cmake b/rapids-cmake/cpm/nvtx3.cmake
@@ -21,7 +21,7 @@ rapids_cpm_nvtx3
 
 .. versionadded:: v24.06.00
 
-Allow projects to find `NVTX3` via `CPM` with built-in tracking of dependencies
+Allow projects to find `nvtx3` via `CPM` with built-in tracking of dependencies
 for correct export support.
 
 Uses the version of nvtx3 :ref:`specified in the version file <cpm_versions>` for consistency
@@ -42,10 +42,10 @@ Result Targets
 
 Result Variables
 ^^^^^^^^^^^^^^^^
-  :cmake:variable:`NVTX3_SOURCE_DIR` is set to the path to the source directory of nvtx3.
-  :cmake:variable:`NVTX3_BINARY_DIR` is set to the path to the build directory of nvtx3.
-  :cmake:variable:`NVTX3_ADDED`      is set to a true value if nvtx3 has not been added before.
-  :cmake:variable:`NVTX3_VERSION`    is set to the version of nvtx3 specified by the versions.json.
+  :cmake:variable:`nvtx3_SOURCE_DIR` is set to the path to the source directory of nvtx3.
+  :cmake:variable:`nvtx3_BINARY_DIR` is set to the path to the build directory of nvtx3.
+  :cmake:variable:`nvtx3_ADDED`      is set to a true value if nvtx3 has not been added before.
+  :cmake:variable:`nvtx3_VERSION`    is set to the version of nvtx3 specified by the versions.json.
 
 #]=======================================================================]
 function(rapids_cpm_nvtx3)
@@ -72,7 +72,7 @@ function(rapids_cpm_nvtx3)
   rapids_cpm_generate_patch_command(nvtx3 ${version} patch_command)
 
   include("${rapids-cmake-dir}/cpm/find.cmake")
-  rapids_cpm_find(NVTX3 ${version} ${ARGN}
+  rapids_cpm_find(nvtx3 ${version} ${ARGN}
                   GLOBAL_TARGETS nvtx3-c nvtx3-cpp
                   CPM_ARGS
                   GIT_REPOSITORY ${repository}
@@ -81,15 +81,15 @@ function(rapids_cpm_nvtx3)
                   EXCLUDE_FROM_ALL ${exclude})
 
   include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake")
-  rapids_cpm_display_patch_status(NVTX3)
+  rapids_cpm_display_patch_status(nvtx3)
 
   # Extract the major version value of nvtx3 to use with `rapids-export` to setup compatibility
   # rules
   include("${rapids-cmake-dir}/cmake/parse_version.cmake")
   rapids_cmake_parse_version(MAJOR ${version} ${version})
 
-  # Set up install rules Need to be re-entrant safe so only call when `NVTX3_ADDED`
-  if(NVTX3_ADDED)
+  # Set up install rules Need to be re-entrant safe so only call when `nvtx3_ADDED`
+  if(nvtx3_ADDED)
     install(TARGETS nvtx3-c nvtx3-cpp EXPORT nvtx3-targets)
     if(_RAPIDS_BUILD_EXPORT_SET)
       include("${rapids-cmake-dir}/export/export.cmake")
@@ -98,14 +98,12 @@ function(rapids_cpm_nvtx3)
                     EXPORT_SET nvtx3-targets
                     GLOBAL_TARGETS nvtx3-c nvtx3-cpp
                     NAMESPACE nvtx::)
-      rapids_export_package(BUILD nvtx3 ${_RAPIDS_BUILD_EXPORT_SET} GLOBAL_TARGETS nvtx3-c
-                                                                                   nvtx3-cpp)
       rapids_export_find_package_root(BUILD nvtx3 [=[${CMAKE_CURRENT_LIST_DIR}]=]
                                       EXPORT_SET ${_RAPIDS_BUILD_EXPORT_SET})
     endif()
     if(_RAPIDS_INSTALL_EXPORT_SET AND NOT exclude)
       include(GNUInstallDirs)
-      install(DIRECTORY "${NVTX3_SOURCE_DIR}/c/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+      install(DIRECTORY "${nvtx3_SOURCE_DIR}/c/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
       include("${rapids-cmake-dir}/export/export.cmake")
       rapids_export(INSTALL nvtx3
                     VERSION ${version}
@@ -116,9 +114,9 @@ function(rapids_cpm_nvtx3)
   endif()
 
   # Propagate up variables that CPMFindPackage provide
-  set(NVTX3_SOURCE_DIR "${NVTX3_SOURCE_DIR}" PARENT_SCOPE)
-  set(NVTX3_BINARY_DIR "${NVTX3_BINARY_DIR}" PARENT_SCOPE)
-  set(NVTX3_ADDED "${NVTX3_ADDED}" PARENT_SCOPE)
-  set(NVTX3_VERSION ${version} PARENT_SCOPE)
+  set(nvtx3_SOURCE_DIR "${nvtx3_SOURCE_DIR}" PARENT_SCOPE)
+  set(nvtx3_BINARY_DIR "${nvtx3_BINARY_DIR}" PARENT_SCOPE)
+  set(nvtx3_ADDED "${nvtx3_ADDED}" PARENT_SCOPE)
+  set(nvtx3_VERSION ${version} PARENT_SCOPE)
 
 endfunction()