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

List:       kde-commits
Subject:    [kwin/fredrik/vulkan] /: cmake: Find Vulkan
From:       Fredrik_Höglund <null () kde ! org>
Date:       2018-02-16 17:01:48
Message-ID: E1emjOO-0004Yx-3K () code ! kde ! org
[Download RAW message or body]

Git commit 36b7921fa279bc7b12c5a1f0708f92d017b80f1e by Fredrik H=C3=B6glund.
Committed on 16/02/2018 at 16:57.
Pushed by fredrik into branch 'fredrik/vulkan'.

cmake: Find Vulkan

This bumps the minimum cmake version to 3.7 for find_package(Vulkan).

M  +12   -1    CMakeLists.txt
M  +2    -0    config-kwin.h.cmake

https://commits.kde.org/kwin/36b7921fa279bc7b12c5a1f0708f92d017b80f1e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbf9529ca..d899abe79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
 =

 project(KWIN)
 set(PROJECT_VERSION "5.12.80")
@@ -150,6 +150,17 @@ set_package_properties(epoxy PROPERTIES DESCRIPTION "l=
ibepoxy"
                        PURPOSE "OpenGL dispatch library"
                       )
 =

+find_package(Vulkan)
+set_package_properties(Vulkan PROPERTIES DESCRIPTION "Vulkan"
+                       URL "https://www.khronos.org/vulkan"
+                       TYPE RUNTIME
+                       PURPOSE "Graphics and compute API"
+                      )
+
+if (Vulkan_FOUND)
+    set(HAVE_VULKAN TRUE)
+endif()
+
 set(HAVE_DL_LIBRARY FALSE)
 if(epoxy_HAS_GLX)
     find_library(DL_LIBRARY dl)
diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake
index 8f680800f..c9ca40fa1 100644
--- a/config-kwin.h.cmake
+++ b/config-kwin.h.cmake
@@ -40,3 +40,5 @@
 #define XCB_ICCCM_WM_STATE_NORMAL 1
 #define XCB_ICCCM_WM_STATE_ICONIC 3
 #endif
+
+#cmakedefine HAVE_VULKAN 1

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