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
619e0b9a
Commit
619e0b9a
authored
12 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
remove some cmake output that is no longer needed
parent
e575a0ef
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/Linking.cmake
+1
-2
1 addition, 2 deletions
indra/cmake/Linking.cmake
indra/cmake/ViewerMiscLibs.cmake
+0
-7
0 additions, 7 deletions
indra/cmake/ViewerMiscLibs.cmake
with
1 addition
and
9 deletions
indra/cmake/Linking.cmake
+
1
−
2
View file @
619e0b9a
...
...
@@ -38,9 +38,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
# packages/lib/release directory to deal with autobuild packages that don't
# provide (e.g.) lib/debug libraries.
list
(
APPEND AUTOBUILD_LIBS_INSTALL_DIRS
${
ARCH_PREBUILT_DIRS_RELEASE
}
)
message
(
STATUS
"CMAKE_BUILD_TYPE =
${
CMAKE_BUILD_TYPE
}
, extending AUTOBUILD_LIBS_INSTALL_DIRS"
)
endif
(
NOT
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
"Release"
)
message
(
STATUS
"For
${
CMAKE_BUILD_TYPE
}
, AUTOBUILD_LIBS_INSTALL_DIRS:
${
AUTOBUILD_LIBS_INSTALL_DIRS
}
"
)
link_directories
(
${
AUTOBUILD_LIBS_INSTALL_DIRS
}
)
if
(
LINUX
)
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/ViewerMiscLibs.cmake
+
0
−
7
View file @
619e0b9a
...
...
@@ -7,10 +7,3 @@ if (NOT STANDALONE)
use_prebuilt_binary
(
fontconfig
)
endif
(
NOT STANDALONE
)
if
(
VIEWER AND NOT STANDALONE
)
if
(
EXISTS
${
CMAKE_SOURCE_DIR
}
/newview/res/have_artwork_bundle.marker
)
message
(
STATUS
"We seem to have an artwork bundle in the tree - brilliant."
)
else
(
EXISTS
${
CMAKE_SOURCE_DIR
}
/newview/res/have_artwork_bundle.marker
)
message
(
FATAL_ERROR
"Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!"
)
endif
(
EXISTS
${
CMAKE_SOURCE_DIR
}
/newview/res/have_artwork_bundle.marker
)
endif
(
VIEWER AND NOT STANDALONE
)
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