diff options
| author | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2020-07-02 19:34:03 +0200 |
|---|---|---|
| committer | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2020-07-02 19:39:30 +0200 |
| commit | 0e0483bf5c383d5815b9f945fea7e347d4badc0e (patch) | |
| tree | 123e137655f228d3714c5e984439fabf8ca7a055 /openmp/cmake | |
| parent | 16989f6f5c69a62eb78c1ab297f64c8182d7604a (diff) | |
| download | llvm-0e0483bf5c383d5815b9f945fea7e347d4badc0e.zip llvm-0e0483bf5c383d5815b9f945fea7e347d4badc0e.tar.gz llvm-0e0483bf5c383d5815b9f945fea7e347d4badc0e.tar.bz2 | |
[OpenMP][CMake] Fix version detection of testing compiler
When configuring in-tree, the correct names are LLVM_VERSION_MAJOR
and LLVM_VERSION_MINOR. This has been wrong since the code was added
in commits fc473dee98 and 821649229e.
Diffstat (limited to 'openmp/cmake')
| -rw-r--r-- | openmp/cmake/OpenMPTesting.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openmp/cmake/OpenMPTesting.cmake b/openmp/cmake/OpenMPTesting.cmake index f854e4d..90e0704 100644 --- a/openmp/cmake/OpenMPTesting.cmake +++ b/openmp/cmake/OpenMPTesting.cmake @@ -133,8 +133,8 @@ else() set(OPENMP_TEST_COMPILER_ID "Clang") # Cannot use CLANG_VERSION because we are not guaranteed that this is already set. set(OPENMP_TEST_COMPILER_VERSION "${LLVM_VERSION}") - set(OPENMP_TEST_COMPILER_VERSION_MAJOR "${LLVM_MAJOR_VERSION}") - set(OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR "${LLVM_MAJOR_VERSION}.${LLVM_MINOR_VERSION}") + set(OPENMP_TEST_COMPILER_VERSION_MAJOR "${LLVM_VERSION_MAJOR}") + set(OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}") # Unfortunately the top-level cmake/config-ix.cmake file mangles CMake's # CMAKE_THREAD_LIBS_INIT variable from the FindThreads package, so work # around that, until it is fixed there. |