From b4a706ca12766ef09d17b0987835e3e53d08c086 Mon Sep 17 00:00:00 2001 From: Jimmy Tremblay-Bernier Date: Tue, 26 Nov 2024 22:25:08 -0500 Subject: [PATCH] CONGE-2 UPDATED CMAKE CONFIG --- Demo1/CMakeLists.txt | 19 +++---------------- Demo1/CompileShaders.py | 1 + 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Demo1/CMakeLists.txt b/Demo1/CMakeLists.txt index a7bb35f..b4c0794 100644 --- a/Demo1/CMakeLists.txt +++ b/Demo1/CMakeLists.txt @@ -5,32 +5,19 @@ set(CMAKE_CXX_STANDARD 20) find_package(Python3 REQUIRED COMPONENTS Interpreter) -set(SHADER_FILES - src/Shaders/Test.frag - src/Shaders/Test.vert -) - add_executable(${PROJECT_NAME} src/main.cpp src/Demo1.cpp src/Demo1.h ) -# STAMP FILE THAT TRACK THE CHANGES IN SHADERS -set(OUTPUT_SHADER_STAMP "${CMAKE_CURRENT_SOURCE_DIR}/src/Shaders/shaders.stamp") - -# COMPILE SHADERS USING PYTHON -add_custom_command( - OUTPUT ${OUTPUT_SHADER_STAMP} +# CREATE CUSTOM TARGET THAT COMPILE SHADERS EVERY BUILD +add_custom_target(shader_compilation ALL COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/CompileShaders.py ${CMAKE_CURRENT_SOURCE_DIR}/src/Shaders ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${SHADER_FILES} COMMENT "Compiling shaders" ) -# CREATE CUSTOM TARGET THAT LINK THE COMMAND TO THE PROJECT -add_custom_target(shader_compilation DEPENDS ${OUTPUT_SHADER_STAMP}) - -# ADD THE CUSTOM TARGET AS A DEPENDENCY +# ADD THE CUSTOM TARGET AS A DEPENDENCY OF DEMO1 add_dependencies(${PROJECT_NAME} shader_compilation) target_link_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/ConjureEngine) diff --git a/Demo1/CompileShaders.py b/Demo1/CompileShaders.py index 3ad4277..0cf7f44 100644 --- a/Demo1/CompileShaders.py +++ b/Demo1/CompileShaders.py @@ -18,6 +18,7 @@ def filterFunc(fileName): return params[len(params) - 1] != "spv" def __main__(): + SHADERS_PATH = os.path.join(os.getcwd()) if os.name == "nt": GLSLC_PATH = os.path.join(os.environ.get("VULKAN_SDK"), "bin", "glslc")