Fixes with cmake > 3.25

Author: wdeconinck

cmake/FindNVTX.cmake

@@ -11,7 +11,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "PGI" OR CMAKE_C_COMPILER_ID STREQUAL "NVHPC" )
     set (DEFAULT_DR_HOOK_NVTX ON)
 
     if( ${CMAKE_VERSION} VERSION_LESS "3.25" )
-        find_package(CUDAToolkit REQUIRED COMPONENTS CUDA::nvToolsExt)
+        find_package(CUDAToolkit COMPONENTS CUDA::nvToolsExt)
 
         find_path(NVTX_ROOT
                 NAMES include/nvToolsExt.h
@@ -37,9 +37,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "PGI" OR CMAKE_C_COMPILER_ID STREQUAL "NVHPC" )
         mark_as_advanced(
                 NVTX_LIBRARIES
                 NVTX_INCLUDE_DIRS
-        )
+                )
     else()
-        find_package(CUDAToolkit REQUIRED COMPONENTS CUDA::nvtx3)
+        find_package(CUDAToolkit COMPONENTS CUDA::nvtx3)
 
         find_path(NVTX_ROOT
                 NAMES include/nvtx3/nvToolsExt.h
@@ -58,10 +58,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "PGI" OR CMAKE_C_COMPILER_ID STREQUAL "NVHPC" )
 
         mark_as_advanced(
                 NVTX_INCLUDE_DIRS
-        )
+                )
     endif()
 
 
 else ()
     set (DEFAULT_DR_HOOK_NVTX OFF)
-endif ()
+endif ()

src/fiat/CMakeLists.txt

@@ -76,9 +76,12 @@ if (HAVE_DR_HOOK_NVTX)
     target_include_directories(fiat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/drhook/extensions/nvtx)
 
     # Files defined externally
-    target_link_libraries     ( fiat PRIVATE ${NVTX_LIBRARIES} )
     target_include_directories( fiat PRIVATE ${NVTX_INCLUDE_DIRS} )
     target_compile_definitions( fiat PRIVATE DR_HOOK_HAVE_NVTX=1 )
+    if( CMAKE_VERSION VERSION_LESS 3.25 )
+        target_link_libraries     ( fiat PRIVATE ${NVTX_LIBRARIES} )
+        target_compile_definitions( fiat PRIVATE DR_HOOK_NVTX_LEGACY )
+    endif()
 endif()
 
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )

src/fiat/drhook/extensions/nvtx/dr_hook_nvtx.c

@@ -9,8 +9,11 @@
  * nor does it submit to any jurisdiction.
  */
 
+#ifdef DR_HOOK_NVTX_LEGACY
 #include <nvToolsExt.h>
-//#include <nvtx3/nvToolsExt.h>
+#else
+#include <nvtx3/nvToolsExt.h>
+#endif
 #include <string.h>
 #include <stdlib.h>