From e976a3266e4ce153556b62ba73df6d18e756bf23 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 7 May 2019 03:12:11 +0800 Subject: [PATCH] =?UTF-8?q?CMAKE=E5=B7=A5=E7=A8=8B=E6=94=B9=E4=B8=BALinux?= =?UTF-8?q?=E4=B8=8B=E4=B9=9F=E4=BD=BF=E7=94=A8=E8=87=AA=E5=B8=A6=E7=9A=84?= =?UTF-8?q?SPIRV-Cross?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae36056a..7d339bf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)