Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
JennaHuntsman
XDG Integration
Commits
d2fa5a53
Commit
d2fa5a53
authored
6 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
remove unused UNATTENDED cmake variable that generates warnings
parent
837ca229
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.sh
+0
-1
0 additions, 1 deletion
build.sh
indra/cmake/Variables.cmake
+0
-1
0 additions, 1 deletion
indra/cmake/Variables.cmake
indra/newview/CMakeLists.txt
+12
-14
12 additions, 14 deletions
indra/newview/CMakeLists.txt
with
12 additions
and
16 deletions
build.sh
+
0
−
1
View file @
d2fa5a53
...
...
@@ -120,7 +120,6 @@ pre_build()
"
$autobuild
"
configure
--quiet
-c
$variant
--
\
-DPACKAGE
:BOOL
=
ON
\
-DUNATTENDED
:BOOL
=
ON
\
-DHAVOK
:BOOL
=
"
$HAVOK
"
\
-DRELEASE_CRASH_REPORTING
:BOOL
=
"
$RELEASE_CRASH_REPORTING
"
\
-DVIEWER_CHANNEL
:STRING
=
"
${
viewer_channel
}
"
\
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/Variables.cmake
+
0
−
1
View file @
d2fa5a53
...
...
@@ -209,7 +209,6 @@ set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if
set
(
VERSION_BUILD
"0"
CACHE STRING
"Revision number passed in from the outside"
)
set
(
USESYSTEMLIBS OFF CACHE BOOL
"Use libraries from your system rather than Linden-supplied prebuilt libraries."
)
set
(
UNATTENDED OFF CACHE BOOL
"Should be set to ON for building with VC Express editions."
)
set
(
USE_PRECOMPILED_HEADERS ON CACHE BOOL
"Enable use of precompiled header directives where supported."
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/CMakeLists.txt
+
12
−
14
View file @
d2fa5a53
...
...
@@ -1853,23 +1853,21 @@ if (WINDOWS)
add_dependencies
(
${
VIEWER_BINARY_NAME
}
SLPlugin
windows-crash-logger
windows-crash-logger
)
# sets the 'working directory' for debugging from visual studio.
if
(
NOT UNATTENDED
)
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
)
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."
)
if
(
PACKAGE
)
add_custom_command
(
...
...
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