From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 5 Dec 2022 02:05:39 +0000 (+0100)
Subject: vkvg as c library, vma still require c++ dependencies
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=0226b872a03cff6ebfd0150b126f277dedf9cc35;p=jp%2Fvkvg.git

vkvg as c library, vma still require c++ dependencies
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02a879c..175c8d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
 
-SET(CMAKE_C_STANDARD 11)
+SET(LANG "C")
+SET(CMAKE_${LANG}_STANDARD 11)
+SET(CMAKE_${LANG}_EXTENSIONS on)
+
 SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_C_EXTENSIONS on)
 
 OPTION (VKVG_BUILD_SHARED_LIB "Build using shared libraries" ON)
 
@@ -264,6 +266,7 @@ FUNCTION (setup_lib LibName)
 			VERSION ${vkvg_VERSION_MAJOR}.${vkvg_VERSION_MINOR}
 			SOVERSION ${vkvg_VERSION_MAJOR}
 			C_STANDARD 11
+			LINKER_LANGUAGE C
 			PUBLIC_HEADER "${VKVG_PUBLIC_HEADERS}"
 	)
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f8d4377..3911819 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,6 +11,11 @@ ENDIF ()
 FUNCTION (buildtest TEST_FILE)
 	GET_FILENAME_COMPONENT(TEST_NAME ${TEST_FILE} NAME_WE)
 	ADD_EXECUTABLE(${TEST_NAME} ${TEST_FILE} $<TARGET_OBJECTS:tests_common>)
+	SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES
+			OUTPUT_NAME ${TEST_NAME}
+			C_STANDARD 11
+			LINKER_LANGUAGE C
+	)
 	TARGET_INCLUDE_DIRECTORIES(${TEST_NAME}
 		PRIVATE
 			${Vulkan_INCLUDE_DIRS}
@@ -25,7 +30,7 @@ FUNCTION (buildtest TEST_FILE)
 		PRIVATE
 			${Vulkan_LIBRARIES}
 			${GLFW3_LIBRARY}
-                        Threads::Threads
+			Threads::Threads
 	)
 	IF (TARGET vkvg_static)
 		TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE vkvg_static)
@@ -73,7 +78,7 @@ add_custom_target("${PROJECT_NAME}_DataCopy" ALL DEPENDS ${DATAS})
 file(GLOB TESTS
 	"*.c"
 	"perfs/*.c"
-        "multithreading/*.c"
+	"multithreading/*.c"
 )
 
 IF (VKVG_SVG)
diff --git a/vkh b/vkh
index 1d0c0f4..bede6ae 160000
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 1d0c0f45a2389d2e8b93c8c562ef467196fc38fd
+Subproject commit bede6aeb4264040784a422e64796ce21a012eab5