Updated targets
This commit is contained in:
parent
5647511c89
commit
9ae3bcac27
2 changed files with 6 additions and 7 deletions
4
Makefile
4
Makefile
|
|
@ -68,9 +68,7 @@ mk_cmake:
|
|||
-DKOMPUTE_OPT_BUILD_SHADERS=1 \
|
||||
-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1 \
|
||||
-DKOMPUTE_OPT_ENABLE_SPDLOG=1 \
|
||||
-DSPDLOG_INSTALL=1 \
|
||||
-DKOMPUTE_OPT_CODE_COVERAGE=1 \
|
||||
-DSHADERC_SKIP_TESTS=1 \
|
||||
-G "Unix Makefiles"
|
||||
|
||||
mk_build_all:
|
||||
|
|
@ -123,8 +121,6 @@ vs_cmake:
|
|||
-DKOMPUTE_OPT_BUILD_SHADERS=1 \
|
||||
-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1 \
|
||||
-DKOMPUTE_OPT_ENABLE_SPDLOG=1 \
|
||||
-DSPDLOG_INSTALL=1 \
|
||||
-DSHADERC_SKIP_TESTS=1 \
|
||||
-G "Visual Studio 16 2019"
|
||||
|
||||
vs_build_all:
|
||||
|
|
|
|||
|
|
@ -42,14 +42,17 @@ add_test(NAME test_kompute COMMAND test_kompute)
|
|||
#################### PYSHADERC #######################
|
||||
#####################################################
|
||||
|
||||
if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/external/shaderc EXCLUDE_FROM_ALL
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kompute_shaderc)
|
||||
set(SHADERC_SKIP_TESTS 1)
|
||||
|
||||
if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
||||
# Ensure shaderc is initialised by cloning all dependencies
|
||||
message(STATUS "Cloning all repositories for shaderc dependency")
|
||||
execute_process(COMMAND
|
||||
python3 ${PROJECT_SOURCE_DIR}/external/shaderc/utils/git-sync-deps)
|
||||
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/external/shaderc EXCLUDE_FROM_ALL
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kompute_shaderc)
|
||||
|
||||
target_include_directories(
|
||||
test_kompute PRIVATE
|
||||
${shaderc_SOURCE_DIR}/include)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue