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
cc6d6e2d
Commit
cc6d6e2d
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Add binary package for absl to reduce configure and build times
parent
a166d446
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
autobuild.xml
+76
-0
76 additions, 0 deletions
autobuild.xml
indra/deps/CMakeLists.txt
+31
-30
31 additions, 30 deletions
indra/deps/CMakeLists.txt
indra/llcommon/CMakeLists.txt
+1
-0
1 addition, 0 deletions
indra/llcommon/CMakeLists.txt
indra/newview/CMakeLists.txt
+1
-0
1 addition, 0 deletions
indra/newview/CMakeLists.txt
with
109 additions
and
30 deletions
autobuild.xml
+
76
−
0
View file @
cc6d6e2d
...
@@ -49,6 +49,82 @@
...
@@ -49,6 +49,82 @@
<key>
version
</key>
<key>
version
</key>
<string>
2.0.14
</string>
<string>
2.0.14
</string>
</map>
</map>
<key>
abseil-cpp
</key>
<map>
<key>
canonical_repo
</key>
<string>
https://git.alchemyviewer.org/alchemy/thirdparty/3p-abseil-cpp
</string>
<key>
copyright
</key>
<string>
Copyright 2018 The Abseil Authors.
</string>
<key>
description
</key>
<string>
Abseil is an open-source collection of C++ code designed to augment the C++ standard library.
</string>
<key>
license
</key>
<string>
Apache 2.0
</string>
<key>
license_file
</key>
<string>
LICENSES/abseil-cpp.txt
</string>
<key>
name
</key>
<string>
abseil-cpp
</string>
<key>
platforms
</key>
<map>
<key>
darwin64
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
8a39c22df213748c1407f9deef27de6ebf4643c3310281bd619eb936275a8ca1fb6b66359652b6f62a83a8faa7d98b12
</string>
<key>
hash_algorithm
</key>
<string>
sha3_384
</string>
<key>
url
</key>
<string>
https://git.alchemyviewer.org/api/v4/projects/163/packages/generic/abseil-cpp/0.0.0.1044.1044/abseil_cpp-0.0.0.1044-darwin64-1044.tar.xz
</string>
</map>
<key>
name
</key>
<string>
darwin64
</string>
</map>
<key>
linux64
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
a5ac070e08969c6221bb038a38036fb45131bf7fb81c1651691931b46fdf07c0d6041beb328afc8cf71d23463e636f7b
</string>
<key>
hash_algorithm
</key>
<string>
sha3_384
</string>
<key>
url
</key>
<string>
https://git.alchemyviewer.org/api/v4/projects/163/packages/generic/abseil-cpp/0.0.0.1044.1044/abseil_cpp-0.0.0.1044-linux64-1044.tar.xz
</string>
</map>
<key>
name
</key>
<string>
linux64
</string>
</map>
<key>
windows
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
17dbe3aea3b61db570b36b91b0a69c7a508e58121f86829fa6ab16c4c28c3da5b1a84dc5a10dabf795a396faf77b32a0
</string>
<key>
hash_algorithm
</key>
<string>
sha3_384
</string>
<key>
url
</key>
<string>
https://git.alchemyviewer.org/api/v4/projects/163/packages/generic/abseil-cpp/0.0.0.1044.1044/abseil_cpp-0.0.0.1044-windows-1044.tar.xz
</string>
</map>
<key>
name
</key>
<string>
windows
</string>
</map>
<key>
windows64
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
61364464848fa6731f804ba06a490f009ffa3a30758d94a1420d8bc87e8cb112146619ffcb3a22cdb40322576e403779
</string>
<key>
hash_algorithm
</key>
<string>
sha3_384
</string>
<key>
url
</key>
<string>
https://git.alchemyviewer.org/api/v4/projects/163/packages/generic/abseil-cpp/0.0.0.1044.1044/abseil_cpp-0.0.0.1044-windows64-1044.tar.xz
</string>
</map>
<key>
name
</key>
<string>
windows64
</string>
</map>
</map>
<key>
version
</key>
<string>
0.0.0.1044
</string>
</map>
<key>
apr_suite
</key>
<key>
apr_suite
</key>
<map>
<map>
<key>
copyright
</key>
<key>
copyright
</key>
...
...
This diff is collapsed.
Click to expand it.
indra/deps/CMakeLists.txt
+
31
−
30
View file @
cc6d6e2d
...
@@ -2,6 +2,7 @@ project(deps)
...
@@ -2,6 +2,7 @@ project(deps)
include
(
00-Common
)
include
(
00-Common
)
include
(
FetchContent
)
include
(
FetchContent
)
include
(
Abseil
)
set
(
CMAKE_FOLDER
"Third Party"
)
set
(
CMAKE_FOLDER
"Third Party"
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
set
(
CMAKE_POSITION_INDEPENDENT_CODE ON
)
...
@@ -49,43 +50,43 @@ FetchContent_Declare(
...
@@ -49,43 +50,43 @@ FetchContent_Declare(
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/modernjson.git
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/modernjson.git
GIT_TAG v3.9.1
GIT_TAG v3.9.1
)
)
FetchContent_Declare
(
absl
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/thirdparty/abseil-cpp.git
GIT_TAG a198d62533e8de0c33a6311f38a3335f7930b7c7
)
FetchContent_Declare
(
FetchContent_Declare
(
readerwriterqueue
readerwriterqueue
GIT_REPOSITORY https://github.com/cameron314/readerwriterqueue
GIT_REPOSITORY https://github.com/cameron314/readerwriterqueue
GIT_TAG v1.0.5
GIT_TAG v1.0.5
)
)
# This is a hack because absl has dumb cmake
if
(
NOT USE_BINARY_ABSL
)
set
(
OLD_BUILD_TEST
${
BUILD_TESTING
}
)
FetchContent_Declare
(
set
(
BUILD_TESTING OFF
)
absl
FetchContent_MakeAvailable
(
absl
)
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/thirdparty/abseil-cpp.git
set
(
BUILD_TESTING
${
OLD_BUILD_TEST
}
)
GIT_TAG a198d62533e8de0c33a6311f38a3335f7930b7c7
)
# Supress warnings inside abseil under MSVC
if
(
WINDOWS
)
target_compile_options
(
absl_strings PRIVATE /wd4018
)
target_compile_options
(
absl_str_format_internal PRIVATE /wd4018
)
target_compile_options
(
absl_flags_usage_internal PRIVATE /wd4018
)
target_compile_options
(
absl_random_internal_distribution_test_util PRIVATE /wd4723
)
elseif
(
LINUX
)
target_compile_options
(
absl_flags PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_commandlineflag PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_internal PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_parse PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_private_handle_accessor PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_reflection PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_usage PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_usage_internal PRIVATE -Wno-non-virtual-dtor
)
endif
()
# if (BUILD_TESTING)
# This is a hack because absl has dumb cmake
# FetchContent_MakeAvailable(Catch2)
set
(
OLD_BUILD_TEST
${
BUILD_TESTING
}
)
# endif()
set
(
BUILD_TESTING OFF
)
FetchContent_MakeAvailable
(
absl
)
set
(
BUILD_TESTING
${
OLD_BUILD_TEST
}
)
# Supress warnings inside abseil under MSVC
if
(
WINDOWS
)
target_compile_options
(
absl_strings PRIVATE /wd4018
)
target_compile_options
(
absl_str_format_internal PRIVATE /wd4018
)
target_compile_options
(
absl_flags_usage_internal PRIVATE /wd4018
)
target_compile_options
(
absl_random_internal_distribution_test_util PRIVATE /wd4723
)
elseif
(
LINUX
)
target_compile_options
(
absl_flags PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_commandlineflag PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_internal PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_parse PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_private_handle_accessor PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_reflection PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_usage PRIVATE -Wno-non-virtual-dtor
)
target_compile_options
(
absl_flags_usage_internal PRIVATE -Wno-non-virtual-dtor
)
endif
()
endif
()
# #Download the rest of the libraries
# #Download the rest of the libraries
FetchContent_MakeAvailable
(
fmt
)
FetchContent_MakeAvailable
(
fmt
)
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/CMakeLists.txt
+
1
−
0
View file @
cc6d6e2d
...
@@ -7,6 +7,7 @@ include(LLCommon)
...
@@ -7,6 +7,7 @@ include(LLCommon)
include
(
LLMath
)
include
(
LLMath
)
include
(
bugsplat
)
include
(
bugsplat
)
include
(
Linking
)
include
(
Linking
)
include
(
Abseil
)
include
(
Boost
)
include
(
Boost
)
include
(
LLSharedLibs
)
include
(
LLSharedLibs
)
include
(
Copy3rdPartyLibs
)
include
(
Copy3rdPartyLibs
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/CMakeLists.txt
+
1
−
0
View file @
cc6d6e2d
...
@@ -54,6 +54,7 @@ include(ViewerManager)
...
@@ -54,6 +54,7 @@ include(ViewerManager)
include
(
VisualLeakDetector
)
include
(
VisualLeakDetector
)
include
(
ZLIB
)
include
(
ZLIB
)
include
(
URIPARSER
)
include
(
URIPARSER
)
include
(
Abseil
)
if
(
LLPHYSICSEXTENSIONS_SRC_DIR
)
if
(
LLPHYSICSEXTENSIONS_SRC_DIR
)
if
(
NOT HAVOK_TPV
)
if
(
NOT HAVOK_TPV
)
...
...
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