diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2022-02-28 10:06:08 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2022-04-04 12:34:27 +0200 |
| commit | 892c65cd614910b5fbf53de6e88d277f1cb612e0 (patch) | |
| tree | f4b3b95320534c2cef9031ce1c88727ac4143406 | |
| parent | 6f83912aa49cffab33a2100b052c2fb70c52a92c (diff) | |
set cxx lang for vma
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index acb921e..b8a7fc0 100644 --- 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}) |