[Openmp-commits] [openmp] 8776091 - [OpenMP] Fix installation to old resource dir
Joseph Huber via Openmp-commits
openmp-commits at lists.llvm.org
Mon Nov 14 06:22:32 PST 2022
Author: Joseph Huber
Date: 2022-11-14T08:21:46-06:00
New Revision: 87760910a3111948fa56f2717fbf53e536893b2d
URL: https://github.com/llvm/llvm-project/commit/87760910a3111948fa56f2717fbf53e536893b2d
DIFF: https://github.com/llvm/llvm-project/commit/87760910a3111948fa56f2717fbf53e536893b2d.diff
LOG: [OpenMP] Fix installation to old resource dir
Summary:
The changes in D125860 renamed the old resource directory to only use
the major version. This was not updated for the OpenMP project, causing
OpenMP resources to still be installed in the old `major.minor.rev`
folder. This lead to problems including the header files.
fixes #58966
Added:
Modified:
openmp/CMakeLists.txt
Removed:
################################################################################
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt
index 502a06ed916e..7f6ea8e920a9 100644
--- a/openmp/CMakeLists.txt
+++ b/openmp/CMakeLists.txt
@@ -79,7 +79,7 @@ option(OPENMP_ENABLE_LIBOMP_PROFILING "Enable time profiling for libomp." OFF)
if(${OPENMP_STANDALONE_BUILD})
set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}")
else()
- string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION})
+ string(REGEX MATCH "[0-9]+" CLANG_VERSION ${PACKAGE_VERSION})
set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
endif()
More information about the Openmp-commits
mailing list