From 7dce4cfaf9d1d1973e9be7b002be17b71cdd392a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 9 Mar 2018 15:20:55 +0200 Subject: [PATCH] Added CMake option to suppress zipdir output Cleaned up add_pk3() function a bit --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5809118d8..ddbdc70ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,23 +55,24 @@ function( assort_pk3_source_folder FOLDER_NAME PK3_DIR ) endforeach() endfunction() +option( PK3_QUIET_ZIPDIR "Do not list files processed by zipdir" NO ) +if( PK3_QUIET_ZIPDIR ) + set( PK3_ZIPDIR_OPTIONS "-q" ) +endif() + # Simplify pk3 building, add_pk3(filename srcdirectory) function( add_pk3 PK3_NAME PK3_DIR ) - # message(STATUS "Creating build rule for PK3 ${PK3_NAME} ${PK3_DIR}") # Generate target name. Just use "pk3" for main pk3 target. string( REPLACE "." "_" PK3_TARGET ${PK3_NAME} ) - if( ${PK3_TARGET} STREQUAL "zdoom_pk3" ) - set( PK3_TARGET "pk3" ) - endif() if( NOT ZDOOM_OUTPUT_OLDSTYLE ) add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} - COMMAND zipdir -udf ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR} + COMMAND zipdir -udf ${PK3_ZIPDIR_OPTIONS} ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} $/${PK3_NAME} DEPENDS zipdir ) else() add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} - COMMAND zipdir -udf ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR} + COMMAND zipdir -udf ${PK3_ZIPDIR_OPTIONS} ${ZDOOM_OUTPUT_DIR}/${PK3_NAME} ${PK3_DIR} DEPENDS zipdir ) endif() # Create a list of source files for this PK3, for use in the IDE