diff --git a/CMakeLists.txt b/CMakeLists.txt index 64a512e4..e54ba6ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,36 +98,6 @@ add_definitions(-std=c++11) file(GLOB SOURCE *.cpp ) -# Function for building single example -function(buildExample EXAMPLE_NAME) - # Main - file(GLOB SOURCE *.cpp ${BASE_HEADERS} ${EXAMPLE_NAME}/*.cpp) - SET(MAIN_CPP ${EXAMPLE_NAME}/${EXAMPLE_NAME}.cpp) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE_NAME}/main.cpp) - SET(MAIN_CPP ${EXAMPLE_NAME}/main.cpp) - ENDIF() - # imgui example requires additional source files - IF(${EXAMPLE_NAME} STREQUAL "imgui") - file(GLOB ADD_SOURCE external/imgui/*.cpp) - SET(SOURCE ${SOURCE} ${ADD_SOURCE}) - ENDIF() - # Add shaders - set(SHADER_DIR data/shaders/${EXAMPLE_NAME}) - file(GLOB SHADERS "${SHADER_DIR}/*.vert" "${SHADER_DIR}/*.frag" "${SHADER_DIR}/*.geom" "${SHADER_DIR}/*.tesc" "${SHADER_DIR}/*.tese") - source_group("Shaders" FILES ${SHADERS}) - if(WIN32) - add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS}) - target_link_libraries(${EXAMPLE_NAME} base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS}) - else(WIN32) - add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${SHADERS}) - target_link_libraries(${EXAMPLE_NAME} base ) - endif(WIN32) - - if(RESOURCE_INSTALL_DIR) - install(TARGETS ${EXAMPLE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -endfunction(buildExample) - # Build all examples function(buildExamples) foreach(EXAMPLE ${EXAMPLES}) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index de4f07d0..d1f995ed 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -19,7 +19,7 @@ function(buildExample EXAMPLE_NAME) ENDIF() # Add shaders set(SHADER_DIR "../data/shaders/${EXAMPLE_NAME}") - file(GLOB SHADERS "${SHADER_DIR}/*.vert" "${SHADER_DIR}/*.frag" "${SHADER_DIR}/*.comp" "${SHADER_DIR}/*.geom" "${SHADER_DIR}/*.tesc" "${SHADER_DIR}/*.tese") + file(GLOB SHADERS "${SHADER_DIR}/*.vert" "${SHADER_DIR}/*.frag" "${SHADER_DIR}/*.geom" "${SHADER_DIR}/*.tesc" "${SHADER_DIR}/*.tese" "${SHADER_DIR}/*.mesh" "${SHADER_DIR}/*.task" "${SHADER_DIR}/*.rgen" "${SHADER_DIR}/*.rchit" "${SHADER_DIR}/*.rmiss") source_group("Shaders" FILES ${SHADERS}) if(WIN32) add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${SHADERS})