Trying to fix invalid descriptorlayout
This commit is contained in:
@@ -26,19 +26,17 @@ if (WIN32)
|
||||
# Find library files
|
||||
find_library(
|
||||
ASSIMP_LIBRARY
|
||||
NAMES assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}.lib
|
||||
NAMES assimp-vc${MSVC_TOOLSET_VERSION}-mt${CMAKE_DEBUG_POSTFIX}
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/lib
|
||||
${ASSIMP_ROOT}/lib/
|
||||
PATH_SUFFIXES Debug Release)
|
||||
${ASSIMP_ROOT}/lib/)
|
||||
|
||||
find_file(
|
||||
ASSIMP_BINARY
|
||||
NAMES assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}.dll
|
||||
NAMES assimp-vc${MSVC_TOOLSET_VERSION}-mt${CMAKE_DEBUG_POSTFIX}.dll
|
||||
PATHS
|
||||
$ENV{PROGRAMFILES}/bin
|
||||
${ASSIMP_ROOT}/bin/
|
||||
PATH_SUFFIXES Debug Release)
|
||||
${ASSIMP_ROOT}/bin/)
|
||||
else()
|
||||
# Find include files
|
||||
find_path(
|
||||
|
||||
+13
-1
@@ -8,7 +8,7 @@ set(ASSIMP_BUILD_TESTS OFF CACHE INTERNAL "")
|
||||
set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE INTERNAL "")
|
||||
set(ASSIMP_INSTALL OFF CACHE INTERNAL "")
|
||||
|
||||
add_subdirectory(${ASSIMP_ROOT} ${ASSIMP_ROOT})
|
||||
add_subdirectory(${ASSIMP_ROOT} ${})
|
||||
target_compile_definitions(assimp PRIVATE _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
|
||||
|
||||
#-------------BOOST----------------
|
||||
@@ -97,6 +97,18 @@ list(APPEND EXTRA_CMAKE_ARGS
|
||||
-DSLANG_BINARY=${SLANG_BINARY}
|
||||
-DSLANG_GLSLANG=${SLANG_GLSLANG})
|
||||
|
||||
|
||||
#----------------SPIR-V-CROSS--------------------
|
||||
list(APPEND DEPENDENCIES spirv-cross-reflect)
|
||||
set(SPIRV_CROSS_ENABLE_HLSL OFF CACHE BOOL "")
|
||||
set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "")
|
||||
set(SPIRV_CROSS_CLI OFF CACHE BOOL "")
|
||||
set(SPIRV_CROSS_ENABLE_C_API OFF CACHE BOOL "")
|
||||
set(SPIRV_CROSS_ENABLE_UTIL OFF CACHE BOOL "")
|
||||
set(SPIRV_CROSS_SKIP_INSTALL ON CACHE BOOL "")
|
||||
add_subdirectory(${SPIRV_ROOT})
|
||||
|
||||
|
||||
#-----------------SeeleEngine--------------------
|
||||
ExternalProject_Add(SeeleEngine
|
||||
DEPENDS ${DEPENDENCIES}
|
||||
|
||||
Reference in New Issue
Block a user