summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-03-06 16:31:11 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-03-06 16:31:11 +0200
commit50f0843e7606c09a29738bfb56bf0bb52ed0cbe2 (patch)
treef104a92b35eb3cb3d64298c2c3ff83e9475a151f
parent42ec90a877647ef05d83518bb036d6963c398294 (diff)
Get rid of vstool
-rw-r--r--indra/cmake/00-Common.cmake2
-rw-r--r--indra/newview/CMakeLists.txt20
2 files changed, 7 insertions, 15 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d7957d2b20..03da30649a 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -45,8 +45,6 @@ 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 37da7f2c2a..a7e8db1b1c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1878,19 +1878,13 @@ if (WINDOWS)
)
# 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}))
+ # Condition for version can be moved to requirements once build agents will be updated (see TOOL-3865)
+ if ((NOT UNATTENDED) AND (${CMAKE_VERSION} VERSION_GREATER "3.7.2"))
+ set_property(
+ TARGET ${VIEWER_BINARY_NAME}
+ PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ )
+ endif ((NOT UNATTENDED) AND (${CMAKE_VERSION} VERSION_GREATER "3.7.2"))
if (PACKAGE)
add_custom_command(