Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
ba24af92
Commit
ba24af92
authored
6 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
Fix for local studio builds
parent
f972de1f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/00-Common.cmake
+2
-0
2 additions, 0 deletions
indra/cmake/00-Common.cmake
indra/newview/CMakeLists.txt
+15
-0
15 additions, 0 deletions
indra/newview/CMakeLists.txt
with
17 additions
and
0 deletions
indra/cmake/00-Common.cmake
+
2
−
0
View file @
ba24af92
...
@@ -45,6 +45,8 @@ endif()
...
@@ -45,6 +45,8 @@ endif()
# Don't bother with a MinSizeRel build.
# Don't bother with a MinSizeRel build.
set
(
CMAKE_CONFIGURATION_TYPES
"RelWithDebInfo;Release;Debug"
CACHE STRING
set
(
CMAKE_CONFIGURATION_TYPES
"RelWithDebInfo;Release;Debug"
CACHE STRING
"Supported build types."
FORCE
)
"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.
# Platform-specific compilation flags.
...
...
This diff is collapsed.
Click to expand it.
indra/newview/CMakeLists.txt
+
15
−
0
View file @
ba24af92
...
@@ -1877,6 +1877,21 @@ if (WINDOWS)
...
@@ -1877,6 +1877,21 @@ if (WINDOWS)
windows-crash-logger
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
)
if
(
PACKAGE
)
add_custom_command
(
add_custom_command
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/event_host.tar.bz2
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/event_host.tar.bz2
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment