Fix issue with zeros for versions in cmake tensorrt

Author: lightvector

cpp/CMakeLists.txt

@@ -343,32 +343,36 @@ elseif(USE_BACKEND STREQUAL "TENSORRT")
   # In each case, try the old format and on failure try the new format.
   file(READ "${TENSORRT_INCLUDE_DIR}/NvInferVersion.h" tensorrt_version_header)
 
-  string(REGEX MATCH "#define NV_TENSORRT_MAJOR ([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
-  set(TENSORRT_VERSION_MAJOR ${CMAKE_MATCH_1})
+  set(TENSORRT_VERSION_MAJOR "")
+  set(TENSORRT_VERSION_MINOR "")
+  set(TENSORRT_VERSION_PATCH "")
 
-  if(NOT TENSORRT_VERSION_MAJOR)
-    string(REGEX MATCH "#define TRT_MAJOR_ENTERPRISE ([0-9]+)" tensorrt_major_enterprise ${tensorrt_version_header})
-    if(CMAKE_MATCH_1)
+  string(REGEX MATCH "#define NV_TENSORRT_MAJOR +([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
+  if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
+    set(TENSORRT_VERSION_MAJOR ${CMAKE_MATCH_1})
+  else()
+    string(REGEX MATCH "#define TRT_MAJOR_ENTERPRISE +([0-9]+)" tensorrt_major_enterprise ${tensorrt_version_header})
+    if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
       set(TENSORRT_VERSION_MAJOR ${CMAKE_MATCH_1})
     endif()
   endif()
 
-  string(REGEX MATCH "#define NV_TENSORRT_MINOR ([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
-  set(TENSORRT_VERSION_MINOR ${CMAKE_MATCH_1})
-
-  if(NOT TENSORRT_VERSION_MINOR)
-    string(REGEX MATCH "#define TRT_MINOR_ENTERPRISE ([0-9]+)" tensorrt_minor_enterprise ${tensorrt_version_header})
-    if(CMAKE_MATCH_1)
+  string(REGEX MATCH "#define NV_TENSORRT_MINOR +([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
+  if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
+    set(TENSORRT_VERSION_MINOR ${CMAKE_MATCH_1})
+  else()
+    string(REGEX MATCH "#define TRT_MINOR_ENTERPRISE +([0-9]+)" tensorrt_minor_enterprise ${tensorrt_version_header})
+    if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
       set(TENSORRT_VERSION_MINOR ${CMAKE_MATCH_1})
     endif()
   endif()
 
-  string(REGEX MATCH "#define NV_TENSORRT_PATCH ([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
-  set(TENSORRT_VERSION_PATCH ${CMAKE_MATCH_1})
-
-  if(NOT TENSORRT_VERSION_PATCH)
-    string(REGEX MATCH "#define TRT_PATCH_ENTERPRISE ([0-9]+)" tensorrt_patch_enterprise ${tensorrt_version_header})
-    if(CMAKE_MATCH_1)
+  string(REGEX MATCH "#define NV_TENSORRT_PATCH +([0-9]+)" tensorrt_version_macro ${tensorrt_version_header})
+  if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
+    set(TENSORRT_VERSION_PATCH ${CMAKE_MATCH_1})
+  else()
+    string(REGEX MATCH "#define TRT_PATCH_ENTERPRISE +([0-9]+)" tensorrt_patch_enterprise ${tensorrt_version_header})
+    if(DEFINED CMAKE_MATCH_1 AND NOT "${CMAKE_MATCH_1}" STREQUAL "")
       set(TENSORRT_VERSION_PATCH ${CMAKE_MATCH_1})
     endif()
   endif()