From 4be2b3215707b8a3ec8eb788255db1788efedc56 Mon Sep 17 00:00:00 2001 From: Pere Mato Date: Wed, 24 Feb 2021 14:56:07 +0100 Subject: [PATCH 1/3] Upgraded version of cuda 11.2 --- cmake/toolchain/heptools-contrib.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/toolchain/heptools-contrib.cmake b/cmake/toolchain/heptools-contrib.cmake index be1b35033..d709c2cb9 100644 --- a/cmake/toolchain/heptools-contrib.cmake +++ b/cmake/toolchain/heptools-contrib.cmake @@ -9,3 +9,4 @@ LCG_external_package(cuda 10.2 full=10.2.89_440.33.01 LCG_external_package(cuda 10.1 full=10.1.168_418.67 ) LCG_external_package(cuda 11.0RC full=11.0.1_450.36.06 ) LCG_external_package(cuda 11.1 full=11.1.1_455.32.00 ) +LCG_external_package(cuda 11.2 full=11.2.1_460.32.03 ) \ No newline at end of file -- GitLab From 0e39ee9d4dd2bb42fcfcab0e638aa6373832818d Mon Sep 17 00:00:00 2001 From: Pere Mato Date: Wed, 24 Feb 2021 15:02:27 +0100 Subject: [PATCH 2/3] Add protection --- pyexternals/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index d02f60df0..cf191e482 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -2891,7 +2891,7 @@ Prefix=${Qt5_home} ") # Avoid TakenFromSystem/bin/qmake not such directory error -if(${Qt5_home} STREQUAL "TakenFromSystem") +if("${Qt5_home}" STREQUAL "TakenFromSystem") set(Qt5_qmake /usr/bin/qmake) else() set(Qt5_qmake ${Qt5_home}/bin/qmake) -- GitLab From 98cd83cb69e5bbc96cefa2a810a2539ef074f094 Mon Sep 17 00:00:00 2001 From: Pere Mato Date: Wed, 24 Feb 2021 16:22:46 +0100 Subject: [PATCH 3/3] Rename contrib toolchain to contribpkgs to avoid files chashes --- .../{heptools-contrib.cmake => heptools-contribpkgs.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cmake/toolchain/{heptools-contrib.cmake => heptools-contribpkgs.cmake} (100%) diff --git a/cmake/toolchain/heptools-contrib.cmake b/cmake/toolchain/heptools-contribpkgs.cmake similarity index 100% rename from cmake/toolchain/heptools-contrib.cmake rename to cmake/toolchain/heptools-contribpkgs.cmake -- GitLab