Changeset 196241 in webkit

Timestamp:

Feb 7, 2016 11:25:31 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[cmake] Move LLVM detection for LLVMDisassembler to OptionsCommon.cmake
​https://bugs.webkit.org/show_bug.cgi?id=153961

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-02-07
Reviewed by Michael Catanzaro.

• Source/cmake/OptionsCommon.cmake:
• Source/cmake/OptionsEfl.cmake:
• Source/cmake/OptionsGTK.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-02-07  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Move LLVM detection for LLVMDisassembler to OptionsCommon.cmake
+        https://bugs.webkit.org/show_bug.cgi?id=153961
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+
 2016-02-04  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -125 +125 @@
 endif ()
 
+if (USE_LLVM_DISASSEMBLER)
+    find_package(LLVM REQUIRED)
+    SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
+endif ()
+
 # Enable the usage of OpenMP.
 #  - At this moment, OpenMP is only used as an alternative implementation

trunk/Source/cmake/OptionsEfl.cmake

@@ -283 +283 @@
 endif ()
 
-if (USE_LLVM_DISASSEMBLER)
-    find_package(LLVM REQUIRED)
-    SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
-endif ()
-
 if (ENABLE_FTL_JIT AND NOT WTF_CPU_X86_64 AND NOT DEVELOPER_MODE)
     message(FATAL_ERROR "FTL JIT is only available on X86_64 architecture.")

trunk/Source/cmake/OptionsGTK.cmake

@@ -235 +235 @@
 endif ()
 
-if (USE_LLVM_DISASSEMBLER)
-    if (WTF_CPU_X86_64)
-        find_package(LLVM 3.7)
-        if (NOT LLVM_FOUND)
-            message(FATAL_ERROR "LLVM 3.7 is required for USE_LLVM_DISASSEMBLER")
-        endif ()
-        SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
-    else ()
-        message(FATAL_ERROR "FTL is only supported for X86_64")
-    endif ()
-endif ()
-
 if (ENABLE_GAMEPAD_DEPRECATED)
     find_package(GUdev)