diff --git a/LCG_97/haswell-centos7-gcc9-opt.cmake b/LCG_97/haswell-centos7-gcc9-opt.cmake index 639c89c61a52683c70036bddcf5f7b24ff4b19f9..8815786c7ece7374fa0ae2ec943315713f3e61bf 100644 --- a/LCG_97/haswell-centos7-gcc9-opt.cmake +++ b/LCG_97/haswell-centos7-gcc9-opt.cmake @@ -17,3 +17,5 @@ include_guard(GLOBAL) set(LCG_ARCHITECTURE haswell) include(${CMAKE_CURRENT_LIST_DIR}/x86_64-centos7-gcc9-opt.cmake) + +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/haswell-centos7-gcc9-opt") diff --git a/LCG_97/x86_64+avx2+fma-centos7-gcc9-opt.cmake b/LCG_97/x86_64+avx2+fma-centos7-gcc9-opt.cmake index 63692c8f25f1d8e481eeef21039dae1c7f2c6e48..a5c7591d7d7c7b9c987382f2669fe5995a9dd6f4 100644 --- a/LCG_97/x86_64+avx2+fma-centos7-gcc9-opt.cmake +++ b/LCG_97/x86_64+avx2+fma-centos7-gcc9-opt.cmake @@ -17,3 +17,5 @@ include_guard(GLOBAL) set(LCG_ARCHITECTURE x86_64+avx2+fma) include(${CMAKE_CURRENT_LIST_DIR}/x86_64-centos7-gcc9-opt.cmake) + +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64+avx2+fma-centos7-gcc9-opt") diff --git a/LCG_97/x86_64-centos7-clang8-dbg.cmake b/LCG_97/x86_64-centos7-clang8-dbg.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..e3ae9dda6dbf912106ddfd096e74b0760de18688 100644 --- a/LCG_97/x86_64-centos7-clang8-dbg.cmake +++ b/LCG_97/x86_64-centos7-clang8-dbg.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-clang8-dbg") cmake_policy(POP) diff --git a/LCG_97/x86_64-centos7-clang8-opt.cmake b/LCG_97/x86_64-centos7-clang8-opt.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..869f9561a9a887ea982274e2f12a685f0546e789 100644 --- a/LCG_97/x86_64-centos7-clang8-opt.cmake +++ b/LCG_97/x86_64-centos7-clang8-opt.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-clang8-opt") cmake_policy(POP) diff --git a/LCG_97/x86_64-centos7-gcc9-dbg.cmake b/LCG_97/x86_64-centos7-gcc9-dbg.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..2937492d371a40f544552b78c959c6ffb44a6f5e 100644 --- a/LCG_97/x86_64-centos7-gcc9-dbg.cmake +++ b/LCG_97/x86_64-centos7-gcc9-dbg.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-gcc9-dbg") cmake_policy(POP) diff --git a/LCG_97/x86_64-centos7-gcc9-opt.cmake b/LCG_97/x86_64-centos7-gcc9-opt.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..b990c0990e22bf3b14bd80298c258952e9ba9223 100644 --- a/LCG_97/x86_64-centos7-gcc9-opt.cmake +++ b/LCG_97/x86_64-centos7-gcc9-opt.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-gcc9-opt") cmake_policy(POP) diff --git a/LCG_97_LHCB_1/haswell-centos7-gcc9-opt.cmake b/LCG_97_LHCB_1/haswell-centos7-gcc9-opt.cmake new file mode 100644 index 0000000000000000000000000000000000000000..8815786c7ece7374fa0ae2ec943315713f3e61bf --- /dev/null +++ b/LCG_97_LHCB_1/haswell-centos7-gcc9-opt.cmake @@ -0,0 +1,21 @@ +############################################################################### +# (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### + +# DO NOT EDIT: File generated by new_lcg_version.py + +# Make sure the toolchain is included only once +# (to avoid double changes to the environment) +include_guard(GLOBAL) + +set(LCG_ARCHITECTURE haswell) +include(${CMAKE_CURRENT_LIST_DIR}/x86_64-centos7-gcc9-opt.cmake) + +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/haswell-centos7-gcc9-opt") diff --git a/LCG_97_LHCB_1/x86_64+avx2+fma-centos7-gcc9-opt.cmake b/LCG_97_LHCB_1/x86_64+avx2+fma-centos7-gcc9-opt.cmake new file mode 100644 index 0000000000000000000000000000000000000000..a5c7591d7d7c7b9c987382f2669fe5995a9dd6f4 --- /dev/null +++ b/LCG_97_LHCB_1/x86_64+avx2+fma-centos7-gcc9-opt.cmake @@ -0,0 +1,21 @@ +############################################################################### +# (c) Copyright 2020 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### + +# DO NOT EDIT: File generated by new_lcg_version.py + +# Make sure the toolchain is included only once +# (to avoid double changes to the environment) +include_guard(GLOBAL) + +set(LCG_ARCHITECTURE x86_64+avx2+fma) +include(${CMAKE_CURRENT_LIST_DIR}/x86_64-centos7-gcc9-opt.cmake) + +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64+avx2+fma-centos7-gcc9-opt") diff --git a/LCG_97_LHCB_1/x86_64-centos7-gcc9-dbg.cmake b/LCG_97_LHCB_1/x86_64-centos7-gcc9-dbg.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..2937492d371a40f544552b78c959c6ffb44a6f5e 100644 --- a/LCG_97_LHCB_1/x86_64-centos7-gcc9-dbg.cmake +++ b/LCG_97_LHCB_1/x86_64-centos7-gcc9-dbg.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-gcc9-dbg") cmake_policy(POP) diff --git a/LCG_97_LHCB_1/x86_64-centos7-gcc9-opt.cmake b/LCG_97_LHCB_1/x86_64-centos7-gcc9-opt.cmake index 542bf1f3a06970dd4d9b79e3cb881dd0a3be69cf..b990c0990e22bf3b14bd80298c258952e9ba9223 100644 --- a/LCG_97_LHCB_1/x86_64-centos7-gcc9-opt.cmake +++ b/LCG_97_LHCB_1/x86_64-centos7-gcc9-opt.cmake @@ -94,4 +94,5 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/InstallArea/x86_64-centos7-gcc9-opt") cmake_policy(POP) diff --git a/utils/new_lcg_version.py b/utils/new_lcg_version.py index acd1318b09f0eaef5f5720393d4a05f10d1d5983..0fd575d0a91fb19d25ad8b345f46c9be34232d1d 100755 --- a/utils/new_lcg_version.py +++ b/utils/new_lcg_version.py @@ -122,7 +122,7 @@ def _entry_point(version, platform): platform, lcg_platform = platform.split("=", 1) architecture = platform.split("-")[0] return TOOLCHAIN_ALIAS.format( - architecture=architecture, lcg_platform=lcg_platform + platform=platform, architecture=architecture, lcg_platform=lcg_platform ) else: return TOOLCHAIN_ENTRY_POINT.format(version=version, platform=platform) @@ -340,6 +340,7 @@ foreach(_action IN ITEMS COMPILE LINK CUSTOM) endif() endforeach() +set(CMAKE_INSTALL_PREFIX "${{CMAKE_SOURCE_DIR}}/InstallArea/{platform}") cmake_policy(POP) """ @@ -349,6 +350,8 @@ include_guard(GLOBAL) set(LCG_ARCHITECTURE {architecture}) include(${{CMAKE_CURRENT_LIST_DIR}}/{lcg_platform}.cmake) + +set(CMAKE_INSTALL_PREFIX "${{CMAKE_SOURCE_DIR}}/InstallArea/{platform}") """ LCG_PACKAGE_PATH = "${{LCG_releases_base}}/{directory}/{version}-{hash}/{platform}"