From 2539947609c58f621663583c8c5f344ed419e05b Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Tue, 24 Sep 2019 06:00:12 -0700 Subject: [PATCH] Use `configure_file` instead of `file WRITE` to write generated files. (#61) --- .gitignore | 3 ++- cmake/shared.cmake | 9 ++++++--- generated/bounds.cpp.in | 1 + generated/shader_spirv.cpp.in | 1 + generated/vertexdecl.cpp.in | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 generated/bounds.cpp.in create mode 100644 generated/shader_spirv.cpp.in create mode 100644 generated/vertexdecl.cpp.in diff --git a/.gitignore b/.gitignore index 943d8cc..970a8ef 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ Release/ *.sln install/ install_manifest.txt -generated/ +generated/* +!generated/*.in cmake_install.cmake diff --git a/cmake/shared.cmake b/cmake/shared.cmake index aef1259..f2e0717 100644 --- a/cmake/shared.cmake +++ b/cmake/shared.cmake @@ -9,17 +9,20 @@ # this software. If not, see . add_library( bgfx-vertexdecl INTERFACE ) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/generated/vertexdecl.cpp "#include \"${BGFX_DIR}/src/vertexdecl.cpp\"" ) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/vertexdecl.cpp.in + ${CMAKE_CURRENT_BINARY_DIR}/generated/vertexdecl.cpp ) target_sources( bgfx-vertexdecl INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/vertexdecl.cpp ) target_include_directories( bgfx-vertexdecl INTERFACE ${BGFX_DIR}/include ) add_library( bgfx-shader-spirv INTERFACE ) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader_spirv.cpp "#include \"${BGFX_DIR}/src/shader_spirv.cpp\"" ) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader_spirv.cpp.in + ${CMAKE_CURRENT_BINARY_DIR}/generated/shader_spirv.cpp ) target_sources( bgfx-shader-spirv INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader_spirv.cpp ) target_include_directories( bgfx-shader-spirv INTERFACE ${BGFX_DIR}/include ) add_library( bgfx-bounds INTERFACE ) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp "#include \"${BGFX_DIR}/examples/common/bounds.cpp\"" ) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/bounds.cpp.in + ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp ) target_sources( bgfx-bounds INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp ) target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/include ) target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/examples/common ) diff --git a/generated/bounds.cpp.in b/generated/bounds.cpp.in new file mode 100644 index 0000000..1e3029e --- /dev/null +++ b/generated/bounds.cpp.in @@ -0,0 +1 @@ +#include "@BGFX_DIR@/examples/common/bounds.cpp" diff --git a/generated/shader_spirv.cpp.in b/generated/shader_spirv.cpp.in new file mode 100644 index 0000000..89feeb0 --- /dev/null +++ b/generated/shader_spirv.cpp.in @@ -0,0 +1 @@ +#include "@BGFX_DIR@/src/shader_spirv.cpp" diff --git a/generated/vertexdecl.cpp.in b/generated/vertexdecl.cpp.in new file mode 100644 index 0000000..25b016e --- /dev/null +++ b/generated/vertexdecl.cpp.in @@ -0,0 +1 @@ +#include "@BGFX_DIR@/src/vertexdecl.cpp"