[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop/5.0] cmake/modules: Enhance FindClang.cmake logic to find more variations of LLVM installa
From:       Gleb Popov <6yearold () gmail ! com>
Date:       2016-07-13 9:09:29
Message-ID: E1bNGAb-0007vH-MI () code ! kde ! org
[Download RAW message or body]

Git commit fd302ac7b42d231206d709b370c1765baaf81f46 by Gleb Popov.
Committed on 13/07/2016 at 09:11.
Pushed by arrowdodger into branch '5.0'.

Enhance FindClang.cmake logic to find more variations of LLVM installations.

Original patch by Mathias Hasselmann <mathias@taschenorakel.de>

REVIEW: 128341

M  +10   -2    cmake/modules/FindClang.cmake

http://commits.kde.org/kdevelop/fd302ac7b42d231206d709b370c1765baaf81f46

diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake
index 05b3e77..bb72250 100644
--- a/cmake/modules/FindClang.cmake
+++ b/cmake/modules/FindClang.cmake
@@ -29,11 +29,19 @@
 
 #=============================================================================
 
+set(KNOWN_VERSIONS 3.9 3.8 3.7 3.6 3.5)
+
+foreach(version ${KNOWN_VERSIONS})
+    if (LLVM_DIR OR (DEFINED Clang_FIND_VERSION AND Clang_FIND_VERSION VERSION_GREATER version))
+        break()
+    endif ()
+
 if (${Clang_FIND_REQUIRED})
-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+        find_package(LLVM ${version} REQUIRED)
 else ()
-    find_package(LLVM ${Clang_FIND_VERSION})
+        find_package(LLVM ${version})
 endif ()
+endforeach()
 
 set(CLANG_FOUND FALSE)
 
[prev in list] [next in list] [prev in thread] [next in thread]