CMAKE工程改为Linux下也使用自带的SPIRV-Cross

This commit is contained in:
hyzboy 2019-05-07 03:12:11 +08:00
parent aa2b1a3a0a
commit e976a3266e

View File

@ -20,10 +20,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
include_directories(${Vulkan_INCLUDE_DIRS})
SET(SPIRV_CROSS_PATH 3rdpty/SPIRV-Cross)
include_directories(${SPIRV_CROSS_PATH})
add_subdirectory(${SPIRV_CROSS_PATH})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/jsoncpp/include)
add_subdirectory(3rdpty/jsoncpp)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
@ -49,6 +45,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
SET(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/inc)
SET(SPIRV_CROSS_PATH 3rdpty/SPIRV-Cross)
include_directories(${SPIRV_CROSS_PATH})
add_subdirectory(${SPIRV_CROSS_PATH})
add_subdirectory(3rdpty/MathGeoLib)
add_subdirectory(3rdpty/NvTriStrip)
add_subdirectory(src)
@ -62,4 +62,4 @@ SET(ULRE ULRE.Base
${Vulkan_LIBRARY})
add_subdirectory(example)
add_executable(WIP WIP.cpp)
# add_executable(WIP WIP.cpp)