alex/spirv-to-dxil-rs
1
0
Fork 0
mirror of https://github.com/italicsjenga/spirv-to-dxil-rs.git synced 2024-12-23 11:31:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

sys: automatically ensure meson and ninja in cmake build

Browse source
This commit is contained in:
chyyran 2023-02-06 01:40:51 -05:00
parent 90737b79d3
commit 09bdbcdbec
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -207,7 +207,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]] [[package]]
name = "spirv-to-dxil" name = "spirv-to-dxil"
version = "0.2.4" version = "0.2.5"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",

2
spirv-to-dxil-sys/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "spirv-to-dxil-sys" name = "spirv-to-dxil-sys"
version = "0.2.2" version = "0.2.3"
edition = "2021" edition = "2021"
description = "Raw bindings to spirv-to-dxil" description = "Raw bindings to spirv-to-dxil"
license = "MIT" license = "MIT"

17
spirv-to-dxil-sys/native/CMakeLists.txt
View file

@ -15,10 +15,23 @@ if(PIP_EXE STREQUAL "PIP_EXE-NOTFOUND")
message(FATAL_ERROR "pip required") message(FATAL_ERROR "pip required")
endif(PIP_EXE STREQUAL "PIP_EXE-NOTFOUND") endif(PIP_EXE STREQUAL "PIP_EXE-NOTFOUND")
execute_process(COMMAND ${Python_EXECUTABLE} -m pip install mako) cmake_path(GET Python_EXECUTABLE PARENT_PATH PYTHON_DIR)
cmake_path(APPEND PYTHON_DIR "Scripts" OUTPUT_VARIABLE PYTHON_SCRIPTS_DIR)
LIST(APPEND CMAKE_PROGRAM_PATH PYTHON_SCRIPTS_DIR ...)
execute_process(COMMAND ${Python_EXECUTABLE} -m pip install meson ninja mako)
find_program(MESON_EXE meson)
if(MESON_EXE STREQUAL "MESON_EXE-NOTFOUND")
message(FATAL_ERROR "meson failed to install")
endif(MESON_EXE STREQUAL "MESON_EXE-NOTFOUND")
find_program(NINJA_EXE ninja)
if(NINJA_EXE STREQUAL "NINJA_EXE-NOTFOUND")
message(FATAL_ERROR "ninja failed to install")
endif(NINJA_EXE STREQUAL "NINJA_EXE-NOTFOUND")
string(TOLOWER ${CMAKE_BUILD_TYPE} MESON_BUILD_TYPE) string(TOLOWER ${CMAKE_BUILD_TYPE} MESON_BUILD_TYPE)
set(MESA_EXTRA_FLAGS set(MESA_EXTRA_FLAGS
-Dbuildtype=${MESON_BUILD_TYPE} -Dbuildtype=${MESON_BUILD_TYPE}
# enable spirv-to-dxil (obviously) # enable spirv-to-dxil (obviously)