diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-30 14:29:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-30 14:29:00 -0400 |
| commit | 34e6d5321df54d99fd91943f49c764849d77bff0 (patch) | |
| tree | 97230a2e1ba433b12eace2d0eb71c983fe2996e0 | |
| parent | 5ff160f72e8f4eab7a74491a7b848348267a180a (diff) | |
SL-957: Use cygpath to set up output pathname for cygwin tar.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 717c835031..7711488c0f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2261,7 +2261,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE else (NOT BUGSPLAT_DB) # BugSplat symbol-file generation if (WINDOWS) - # Just pack up a tarball containing only the .pdb file for the executable. + # Just pack up a tarball containing only the .pdb file for the + # executable. Because we intend to use cygwin tar, we must render + # VIEWER_SYMBOL_FILE in cygwin path syntax. + execute_process(COMMAND "cygpath" "-u" "${VIEWER_SYMBOL_FILE}" + OUTPUT_VARIABLE VIEWER_SYMBOL_FILE_CYGWIN + OUTPUT_STRIP_TRAILING_WHITESPACE) add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2; # testing a string suffix is painful enough in CMake language that @@ -2269,12 +2274,11 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE COMMAND "tar" ARGS "cjf" - "${VIEWER_SYMBOL_FILE}" - "-C" - "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" + "${VIEWER_SYMBOL_FILE_CYGWIN}" "secondlife-bin.pdb" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-bin.pdb" - COMMENT "Packing viewer PDB into ${VIEWER_SYMBOL_FILE}" + COMMENT "Packing viewer PDB into ${VIEWER_SYMBOL_FILE_CYGWIN}" ) add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}") endif (WINDOWS) |