set cxx lang for vma

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acb921e4ccaa51bbf81dd19d3ee6dc398148334f..b8a7fc03f544411e1f68db46411cdcf429144afb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
 OPTION (VKH_BUILD_SHARED_LIB "Build using shared libraries" OFF)
 OPTION(VKH_ENABLE_VMA "enable Vulkan Memory Allocator" ON)
 
-#if (VKH_ENABLE_VMA)
-#      SET(LANG "CXX")
-#ELSE()
-       SET(LANG "C")
-#ENDIF()
+SET(LANG "C")
 SET(CMAKE_${LANG}_STANDARD 11)
 
-PROJECT(vkh VERSION 0.1.0 DESCRIPTION "Vulkan helpers library" LANGUAGES ${LANG})
+PROJECT(vkh VERSION 0.1.0 DESCRIPTION "Vulkan helpers library")# LANGUAGES ${LANG})
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -96,12 +92,16 @@ GET_DIRECTORY_PROPERTY (vkh_has_root_project PARENT_DIRECTORY)
 
 if (VKH_ENABLE_VMA)
        ADD_LIBRARY(libVMA OBJECT src/VmaUsage.cpp)
-       SET_PROPERTY(TARGET libVMA PROPERTY POSITION_INDEPENDENT_CODE ON)
-        TARGET_INCLUDE_DIRECTORIES(libVMA
-                PUBLIC
-                        ${CMAKE_CURRENT_SOURCE_DIR}/include
-                        ${Vulkan_INCLUDE_DIRS}
-        )
+       SET_TARGET_PROPERTIES(
+               libVMA PROPERTIES
+                       POSITION_INDEPENDENT_CODE ON
+                       LINKER_LANGUAGE CXX
+       )
+       TARGET_INCLUDE_DIRECTORIES(libVMA
+                       PUBLIC
+                                       ${CMAKE_CURRENT_SOURCE_DIR}/include
+                                       ${Vulkan_INCLUDE_DIRS}
+       )
 ENDIF()
 
 ADD_LIBRARY(vkh_obj OBJECT ${VKH_SRC})