Changeset - r25253:e9f6c77e0ff6
[Not reviewed]
master
0 1 0
glx22 - 3 years ago 2021-04-24 15:52:21
glx@openttd.org
Fix: [CMake] Check nforenum and grfcodec return value
1 file changed with 16 insertions and 2 deletions:
0 comments (0 inline, 0 general)
cmake/scripts/CreateGRF.cmake
Show inline comments
 
@@ -39,6 +39,20 @@ foreach(NFO_LINE IN LISTS NFO_LINES)
 
    endif()
 
endforeach()
 

	
 
execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
 
execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
 
execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo RESULT_VARIABLE RESULT)
 
if(RESULT)
 
    if(NOT RESULT MATCHES "^[0-9]*$")
 
        message(FATAL_ERROR "Failed to run NFORenum (${RESULT}), please check NFORENUM_EXECUTABLE variable")
 
    endif()
 
    message(FATAL_ERROR "NFORenum failed")
 
endif()
 

	
 
execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT)
 
if(RESULT)
 
    if(NOT RESULT MATCHES "^[0-9]*$")
 
        message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable")
 
    endif()
 
    message(FATAL_ERROR "GRFCodec failed")
 
endif()
 

	
 
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE})
0 comments (0 inline, 0 general)