[test-suite, CUDA] Minor fixes for libstdc++ detection.
diff --git a/External/CUDA/CMakeLists.txt b/External/CUDA/CMakeLists.txt
index 334a9c2..a34caef 100644
--- a/External/CUDA/CMakeLists.txt
+++ b/External/CUDA/CMakeLists.txt
@@ -36,7 +36,7 @@
# Output:
# Sets Var=x.y.z
macro(get_version Var Path)
- string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" ${Var} ${Path})
+ string(REGEX MATCH "[0-9]+(\\.[0-9]+)*" ${Var} ${Path})
endmacro (get_version)
# Helper function to glob CUDA source files and set LANGUAGE property
@@ -252,7 +252,7 @@
message(STATUS "Found libstdc++ ${GccVersion}")
add_library(libstdcxx-${GccVersion} SHARED IMPORTED)
set_property(TARGET libstdcxx-${GccVersion} PROPERTY IMPORTED_LOCATION
- ${GccDir}/lib64/libstdc++.so)
+ ${_path_to_libstdcxx})
list(APPEND GCC_PATHS ${GccDir})
break()
endif()
