diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-03-04 14:59:33 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-03-04 14:59:33 +0200 |
| commit | 478e4f39d8970a73ffe8bde0d8ec2d870eb9796b (patch) | |
| tree | f48487a62925ea9e4f3a8bc23096983cb122ba83 | |
| parent | ef38e373e6124f1a59a5ffe6c9aaa82f74842e4c (diff) | |
Fix for local studio builds
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 40fc706a99..a421616710 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -45,6 +45,8 @@ endif() # Don't bother with a MinSizeRel build. set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING "Supported build types." FORCE) + +set(UNATTENDED ON CACHE BOOL â€On Windows, turn this OFF to implicitly run VSTool.exe after configure.â€) # Platform-specific compilation flags. diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b5fcb18cfc..37da7f2c2a 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1877,6 +1877,21 @@ if (WINDOWS) windows-crash-logger ) + # sets the 'working directory' for debugging from visual studio. + if ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) + add_custom_command( + TARGET ${VIEWER_BINARY_NAME} POST_BUILD + COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe + ARGS + --solution + ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln + --workingdir + ${VIEWER_BINARY_NAME} + "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging." + ) + endif ((NOT UNATTENDED) AND (NOT DEFINED ENV{TEAMCITY_PROJECT_NAME})) + if (PACKAGE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 |