reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 19:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPack/NuGet: Provide more granular errors

Browse Source 
Address the problem of not knowing when cpack fails to create a nuget
package which occurs when creating multiple nupkgs.

Fixes: #20094
This commit is contained in:
Yacoub Hossain 2020-02-14 14:02:52 -05:00 committed by Brad King
parent b782fc9390
commit e6c470997f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/Internal/CPack/CPackNuGet.cmake
View File

@ -287,7 +287,11 @@ if(CPACK_NUGET_ORDINAL_MONOLITIC)
execute_process( execute_process(
COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS} COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS}
WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
RESULT_VARIABLE _nuget_result
) )
if(NOT _nuget_result EQUAL 0)
message(FATAL_ERROR "Nuget pack failed")
endif()
elseif(CPACK_NUGET_ALL_IN_ONE) elseif(CPACK_NUGET_ALL_IN_ONE)
# This variable `CPACK_NUGET_ALL_IN_ONE` set by C++ code: # This variable `CPACK_NUGET_ALL_IN_ONE` set by C++ code:
@ -300,7 +304,11 @@ elseif(CPACK_NUGET_ALL_IN_ONE)
execute_process( execute_process(
COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS} COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS}
WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
RESULT_VARIABLE _nuget_result
) )
if(NOT _nuget_result EQUAL 0)
message(FATAL_ERROR "Nuget pack failed")
endif()
else() else()
# Is there any grouped component? # Is there any grouped component?
@ -322,7 +330,11 @@ else()
execute_process( execute_process(
COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS} COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS}
WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
RESULT_VARIABLE _nuget_result
) )
if(NOT _nuget_result EQUAL 0)
message(FATAL_ERROR "Nuget pack failed")
endif()
endforeach() endforeach()
endif() endif()
# Is there any single component package needed? # Is there any single component package needed?
@ -341,7 +353,11 @@ else()
execute_process( execute_process(
COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS} COMMAND "${NUGET_EXECUTABLE}" pack ${CPACK_NUGET_PACK_ADDITIONAL_OPTIONS}
WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
RESULT_VARIABLE _nuget_result
) )
if(NOT _nuget_result EQUAL 0)
message(FATAL_ERROR "Nuget pack failed")
endif()
endforeach() endforeach()
endif() endif()
endif() endif()