diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-31 14:26:32 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-31 14:26:32 -0400 |
| commit | 392bf44a1f28dfac7583aca551745fe8499e9fe8 (patch) | |
| tree | 3f0b18f27167102f190d60a2ef1e36bbe7acbba5 | |
| parent | 822e3b15e2491ce8f3bd76c5b3ac70be695108e4 (diff) | |
SL-957: Name VIEWER_BINARY_NAME directly, not an assigned variable.
If this theory is correct, setting VIEWER_APP_EXECUTABLE to VIEWER_BINARY_NAME
and then referencing VIEWER_APP_EXECUTABLE instead of VIEWER_BINARY_NAME
confuses CMake as to the filename involved. <eyeroll/>
| -rw-r--r-- | indra/newview/CMakeLists.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a54ee7279c..6997a4330f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2129,12 +2129,7 @@ if (DARWIN) ) set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app") - # VIEWER_APP_EXECUTABLE was originally a prediction of the executable - # pathname that would result from running viewer_manifest.py, but CMake - # complained that there was no rule to make that executable. Try using the - # existing target. - set(VIEWER_APP_EXECUTABLE "${VIEWER_BINARY_NAME}") - set(VIEWER_APP_DSYM "${VIEWER_APP_EXECUTABLE}.dSYM") + set(VIEWER_APP_DSYM "${VIEWER_BINARY_NAME}.dSYM") set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip") configure_file( @@ -2296,12 +2291,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE add_custom_command(OUTPUT "${VIEWER_APP_DSYM}" COMMAND "dsymutil" ARGS - "${VIEWER_APP_EXECUTABLE}" - DEPENDS "${VIEWER_APP_EXECUTABLE}" + "${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_APP_EXECUTABLE}") + add_dependencies(dsym_generate "${VIEWER_BINARY_NAME}") add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" # See above comments about "tar ...j" COMMAND "tar" |