From: j-p <jp_bruyere@hotmail.com>
Date: Fri, 3 May 2019 16:18:30 +0000 (+0200)
Subject: Travis (#21)
X-Git-Tag: v0.1-alpha~76
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=d4b6c9956ad43352c4339848115fe84937fca54d;p=jp%2Fvkvg.git

Travis (#21)

* travis test

* travis test

* travis test

* travis test

* travis test

* travis test

* travis test

* travis test

* travis test

* travis test
---

diff --git a/.travis.yml b/.travis.yml
index 9517c62..59ec59b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,20 @@
-language: c
+language: cpp
+dist: xenial
+
 os:
-  - linux
-  - osx
-compiler:
-  - gcc
-  - clang
-addons:
-  apt:
-	packages:
-	  - libvulkan
+    - linux
 
+compiler:
+    - g++
 
+install:
+    - wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
+    - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.1.106-xenial.list http://packages.lunarg.com/vulkan/1.1.106/lunarg-vulkan-1.1.106-xenial.list
+    - sudo apt -qq update
+    - sudo apt install vulkan-sdk libharfbuzz-dev libfreetype6-dev libfontconfig1-dev
+#    - sudo apt install libglfw3-dev
 script:
-  - mkdir build
-  - cd build
-  - cmake ..
-  - make -j 4
-
+    - mkdir build
+    - cd build
+    - cmake ..
+    - make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b643e68..a659a1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,7 @@ FUNCTION (buildtest TEST_NAME)
 	ADD_EXECUTABLE(test_${TEST_NAME} "tests/${TEST_NAME}.c" )
 	TARGET_INCLUDE_DIRECTORIES(test_${TEST_NAME} PRIVATE
 		${Vulkan_INCLUDE_DIRS}
+		${GLFW3_INCLUDE_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}/include
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 		${CMAKE_CURRENT_SOURCE_DIR}/tests/common
@@ -180,6 +181,7 @@ if (GLFW3_FOUND)
 	ADD_LIBRARY("tests_common" STATIC tests/common/vkengine.c tests/common/test.c)
 	TARGET_INCLUDE_DIRECTORIES(tests_common PRIVATE
 		${Vulkan_INCLUDE_DIRS}
+		${GLFW3_INCLUDE_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}/include
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 		${CMAKE_CURRENT_SOURCE_DIR}/tests/common
@@ -188,7 +190,7 @@ if (GLFW3_FOUND)
 	)
 	TARGET_LINK_LIBRARIES(tests_common
 		${Vulkan_LIBRARIES}
-		${GLFW3_LIBRARIES}
+		${GLFW3_LIBRARY}
 		vkh_static
 		vkvg
 	)
diff --git a/README.md b/README.md
index c407d28..521d4bd 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@
   Vulkan Vector Graphics
   <br>
 <p align="center">
+  <a href="https://travis-ci.org/jpbruyere/vkvg">
+	<img src="https://travis-ci.org/jpbruyere/vkvg.svg?branch=master">
+  </a>
   <img src="https://img.shields.io/github/license/jpbruyere/vkvg.svg?style=flat-square">
   <a href="https://www.paypal.me/GrandTetraSoftware">
 	<img src="https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square">
@@ -35,10 +38,10 @@ For API documentation and usage, please refer to the [Cairo](https://www.cairogr
 
 <p align="center">
   <a href="https://github.com/jpbruyere/vkvg/blob/master/vkvg-tiger.png">
-    <kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/vkvg-tiger.png" height="260"></kbd>
+	<kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/vkvg-tiger.png" height="260"></kbd>
   </a>
   <a href="https://github.com/jpbruyere/vkvg/blob/master/screenshot1.png">
-    <kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/screenshot1.png" height="260"></kbd>
+	<kbd><img src="https://github.com/jpbruyere/vkvg/blob/master/screenshot1.png" height="260"></kbd>
   </a>
 </p>
 
diff --git a/vkh b/vkh
index 24e6ffa..18388a6 160000
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 24e6ffa99b66341a767caa434069530e9fc516a8
+Subproject commit 18388a6b066cb569dedd4df1125974d0d208a503