diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-10 23:31:51 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-10 23:31:51 +0300 |
| commit | 1b66e4673d9779a1c67cfb074bb15c597d1c5779 (patch) | |
| tree | 1aa96c63f62c9dddec111eee5bb021ced19ea93d /indra/CMakeLists.txt | |
| parent | 7d9b7e93ed0a157320ccc86d65f16e7fdfc8fbf1 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
MergeMerged in lindenlab/viewer-release
Diffstat (limited to 'indra/CMakeLists.txt')
| -rw-r--r-- | indra/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 6c20a813ba..62a8f3f003 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -3,8 +3,8 @@ # cmake_minimum_required should appear before any # other commands to guarantee full compatibility # with the version specified -## prior to 3.4, the Windows manifest handling was missing -cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR) +## 3.8 added VS_DEBUGGER_WORKING_DIRECTORY support +cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") @@ -83,6 +83,12 @@ add_dependencies(viewer secondlife-bin) add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL) +# sets the 'startup project' for debugging from visual studio. +set_property( + DIRECTORY ${VIEWER_PREFIX} + PROPERTY VS_STARTUP_PROJECT secondlife-bin + ) + if (LL_TESTS) # Define after the custom targets are created so # individual apps can add themselves as dependencies |