Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor resgen functionality in CMakeLists.

Browse Source 
By defining a top-level function, we will allow the use of resgen
in multiple projects.

Also removed an redundant edge in the dependency graph.
This commit is contained in:
Philip Rideout
2018-11-27 16:06:53 -08:00
parent 3861accb97
commit 39fbcec767
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@@ -262,6 +262,36 @@ if (FILAMENT_SUPPORTS_VULKAN AND APPLE)
endif()
endif()
# ==================================================================================================
# Common Functions
# ==================================================================================================
# Sets the following variables: RESGEN_HEADER, RESGEN_SOURCE, RESGEN_FLAGS, and RESGEN_OUTPUTS
function(get_resgen_vars ARCHIVE_DIR ARCHIVE_NAME)
set(RESGEN_HEADER "${ARCHIVE_DIR}/${ARCHIVE_NAME}.h" PARENT_SCOPE)
if (WEBGL)
set(RESGEN_SOURCE "${ARCHIVE_DIR}/${ARCHIVE_NAME}.c" PARENT_SCOPE)
else()
if (NOT WIN32)
set(ASM_ARCH_FLAG "-arch ${DIST_ARCH}")
endif()
if (APPLE)
set(RESGEN_SOURCE "${ARCHIVE_DIR}/${ARCHIVE_NAME}.apple.S" PARENT_SCOPE)
else()
set(RESGEN_SOURCE "${ARCHIVE_DIR}/${ARCHIVE_NAME}.S" PARENT_SCOPE)
endif()
set(RESGEN_FLAGS "-I${ARCHIVE_DIR} ${ASM_ARCH_FLAG}" PARENT_SCOPE)
endif()
set(RESGEN_OUTPUTS
${ARCHIVE_DIR}/${ARCHIVE_NAME}.bin
${ARCHIVE_DIR}/${ARCHIVE_NAME}.S
${ARCHIVE_DIR}/${ARCHIVE_NAME}.apple.S
${ARCHIVE_DIR}/${ARCHIVE_NAME}.h
${ARCHIVE_DIR}/${ARCHIVE_NAME}.c
PARENT_SCOPE
)
endfunction()
# ==================================================================================================
# Sub-projects
# ==================================================================================================

33
filament/CMakeLists.txt
View File

@@ -163,22 +163,9 @@ if(IOS AND NOT FILAMENT_SUPPORTS_VULKAN)
endif()
# Embed the binary resource blob for materials.
list(APPEND PRIVATE_HDRS ${RESOURCE_DIR}/materials.h)
if (WEBGL)
list(APPEND SRCS ${RESOURCE_DIR}/materials.c)
else()
if (NOT WIN32)
set(ASM_ARCH_FLAG "-arch ${DIST_ARCH}")
endif()
if (APPLE)
set(ASM_FILE ${RESOURCE_DIR}/materials.apple.S)
else()
set(ASM_FILE ${RESOURCE_DIR}/materials.S)
endif()
list(APPEND SRCS ${ASM_FILE})
set_source_files_properties(${ASM_FILE} PROPERTIES
COMPILE_FLAGS "-I${RESOURCE_DIR} ${ASM_ARCH_FLAG}")
endif()
get_resgen_vars(${RESOURCE_DIR} materials)
list(APPEND PRIVATE_HDRS ${RESGEN_HEADER})
list(APPEND SRCS ${RESGEN_SOURCE})
# ==================================================================================================
# OS specific
@@ -296,21 +283,16 @@ add_custom_command(
)
list(APPEND MATERIAL_BINS ${output_path})
set(resgen_outputs
${RESOURCE_DIR}/materials.bin
${RESOURCE_DIR}/materials.S
${RESOURCE_DIR}/materials.apple.S
${RESOURCE_DIR}/materials.h
${RESOURCE_DIR}/materials.c
)
add_custom_command(
OUTPUT ${resgen_outputs}
OUTPUT ${RESGEN_OUTPUTS}
COMMAND resgen -x ${RESOURCE_DIR} -p materials ${MATERIAL_BINS}
DEPENDS resgen ${MATERIAL_BINS}
COMMENT "Aggregating compiled materials"
)
add_custom_target(filament_materials DEPENDS ${resgen_outputs})
if (DEFINED RESGEN_FLAGS)
set_source_files_properties(${RESGEN_SOURCE} PROPERTIES COMPILE_FLAGS ${RESGEN_FLAGS})
endif()
set(DATA_BINS)
file(MAKE_DIRECTORY "${GENERATION_ROOT}/generated/data/")
@@ -334,7 +316,6 @@ include_directories(src)
# we're building a library
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS} ${DATA_BINS})
add_dependencies(${TARGET} filament_materials)
# specify where the public headers of this library are
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})