diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-31 16:04:31 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-31 16:04:31 -0400 | 
| commit | 92b64fd59e6ac83bec8c165eb2f1ee31ff5eb059 (patch) | |
| tree | 3e8c84c64cd070085f6ec4415ce23b9360fc04d1 | |
| parent | 503c2aa9a30ed484d9f41b415af6ec0f9ca93353 (diff) | |
SL-957: Try removing quotes from ${VIEWER_BINARY_NAME} in CMake deps.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 6997a4330f..bed0132e23 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2251,8 +2251,8 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE        DEPENDS generate_breakpad_symbols.py            VERBATIM) -    add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}") -    add_dependencies(generate_symbols "${VIEWER_BINARY_NAME}") +    add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME} "${VIEWER_COPY_MANIFEST}") +    add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})      if (WINDOWS OR LINUX)        add_dependencies(generate_symbols "${VIEWER_COPY_MANIFEST}")      endif (WINDOWS OR LINUX) @@ -2283,20 +2283,20 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE          DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-bin.pdb"          COMMENT "Packing viewer PDB into ${VIEWER_SYMBOL_FILE_CYGWIN}"          ) -      add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" "${VIEWER_BINARY_NAME}") -      add_dependencies(generate_symbols "${VIEWER_BINARY_NAME}") +      add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME}) +      add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})      endif (WINDOWS)      if (DARWIN)        # Have to run dsymutil first, then pack up the resulting .dSYM directory        add_custom_command(OUTPUT "${VIEWER_APP_DSYM}"          COMMAND "dsymutil"          ARGS -          "${VIEWER_BINARY_NAME}" -        DEPENDS "${VIEWER_BINARY_NAME}" +          ${VIEWER_BINARY_NAME} +        DEPENDS ${VIEWER_BINARY_NAME}          COMMENT "Generating ${VIEWER_APP_DSYM}"          )        add_custom_target(dsym_generate DEPENDS "${VIEWER_APP_DSYM}") -      add_dependencies(dsym_generate "${VIEWER_BINARY_NAME}") +      add_dependencies(dsym_generate ${VIEWER_BINARY_NAME})        add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"          # See above comments about "tar ...j"          COMMAND "tar"  | 
