diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-04 19:28:55 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-04 19:28:55 -0400 |
| commit | d1c6b9820c3c5eda2ca797df104927f4e8f02b24 (patch) | |
| tree | 76b15ca53652760746a05f848faa62f318df20ad /indra | |
| parent | 150199d542453f6e9a3b6c6e466e778ca5a027d0 (diff) | |
SL-957: Try passing dsymutil the full pathname of VIEWER_APP_EXE.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f3b87cb93c..e573b927d7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2129,7 +2129,8 @@ if (DARWIN) ) set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app") - set(VIEWER_APP_DSYM "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}.dSYM") + set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}") + set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM") set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip") configure_file( @@ -2291,9 +2292,7 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE add_custom_command(OUTPUT "${VIEWER_APP_DSYM}" COMMAND "dsymutil" ARGS - ${VIEWER_BINARY_NAME} -## redundant with add_dependencies() below, and possibly harmful -## DEPENDS ${VIEWER_BINARY_NAME} + ${VIEWER_APP_EXE} COMMENT "Generating ${VIEWER_APP_DSYM}" ) add_custom_target(dsym_generate DEPENDS "${VIEWER_APP_DSYM}") |