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
0fe901d6
Commit
0fe901d6
authored
10 years ago
by
callum_linden
Browse files
Options
Downloads
Patches
Plain Diff
Point to initial pass at a CEF package in autobuild and make sure autobuild configure picks it up
parent
dbdef626
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
autobuild.xml
+9
-37
9 additions, 37 deletions
autobuild.xml
indra/cmake/CEFPlugin.cmake
+1
-0
1 addition, 0 deletions
indra/cmake/CEFPlugin.cmake
with
10 additions
and
37 deletions
autobuild.xml
+
9
−
37
View file @
0fe901d6
...
@@ -1625,65 +1625,37 @@
...
@@ -1625,65 +1625,37 @@
<key>
version
</key>
<key>
version
</key>
<string>
1.0.298370
</string>
<string>
1.0.298370
</string>
</map>
</map>
<key>
llqtwebkit
</key>
<key>
cef
</key>
<map>
<map>
<key>
copyright
</key>
<key>
copyright
</key>
<string>
Copyright (
C
) 20
10 Nokia Corp
or
a
tion
and/or its subsidiary(-ies).
</string>
<string>
>
Copyright (
c
) 20
08-2014 Marshall A. Greenblatt. P
ortion
s Copyright (c) 2006-2009 Google Inc. All rights reserved
</string>
<key>
description
</key>
<key>
description
</key>
<string>
QT cross-platform application and UI framework.
</string>
<string>
Chromium Embedded Framework (CEF) Standard Binary Distribution
</string>
<key>
license
</key>
<key>
license
</key>
<string>
LGPL
</string>
<string>
BSD
</string>
<key>
license_file
</key>
<key>
license_file
</key>
<string>
LICENSES/
llqtwebkit
.txt
</string>
<string>
LICENSES/
BSD
.txt
</string>
<key>
name
</key>
<key>
name
</key>
<string>
llqtwebkit
</string>
<string>
cef
</string>
<key>
platforms
</key>
<key>
platforms
</key>
<map>
<map>
<key>
darwin
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
3c2b6be4c78b2479c3fae612e1053d37
</string>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20141015.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
darwin
</string>
</map>
<key>
linux
</key>
<map>
<key>
archive
</key>
<map>
<key>
hash
</key>
<string>
d31358176b9ba8c676458cc061767c0b
</string>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<key>
url
</key>
<string>
http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Linux/installer/llqtwebkit-4.7.1-linux-20141015.tar.bz2
</string>
</map>
<key>
name
</key>
<string>
linux
</string>
</map>
<key>
windows
</key>
<key>
windows
</key>
<map>
<map>
<key>
archive
</key>
<key>
archive
</key>
<map>
<map>
<key>
hash
</key>
<key>
hash
</key>
<string>
bb
4e8c8006c8a7aef6d3e3c36a8cebbf
</string>
<string>
bb
6eda4480a04068e76a1d14c908e591
</string>
<key>
hash_algorithm
</key>
<key>
hash_algorithm
</key>
<string>
md5
</string>
<string>
md5
</string>
<key>
url
</key>
<key>
url
</key>
<string>
http://
automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/CYGWIN/installer/llqtwebkit-4.7.1
-windows-
20141015
.tar.bz2
</string>
<string>
http
s
://
callum-linden.s3.amazonaws.com/cef-3.2272.2035.80000
-windows-
800000
.tar.bz2
</string>
</map>
</map>
<key>
name
</key>
<key>
name
</key>
<string>
windows
</string>
<string>
windows
</string>
</map>
</map>
</map>
</map>
<key>
version
</key>
<key>
version
</key>
<string>
4.7.1
</string>
<string>
3.2272.2035.999999
</string>
</map>
</map>
<key>
mesa
</key>
<key>
mesa
</key>
<map>
<map>
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/CEFPlugin.cmake
+
1
−
0
View file @
0fe901d6
...
@@ -6,6 +6,7 @@ if (USESYSTEMLIBS)
...
@@ -6,6 +6,7 @@ if (USESYSTEMLIBS)
set
(
CEFPLUGIN OFF CACHE BOOL
set
(
CEFPLUGIN OFF CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps."
)
"CEFPLUGIN support for the llplugin/llmedia test apps."
)
else
(
USESYSTEMLIBS
)
else
(
USESYSTEMLIBS
)
use_prebuilt_binary
(
cef
)
set
(
CEFPLUGIN ON CACHE BOOL
set
(
CEFPLUGIN ON CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps."
)
"CEFPLUGIN support for the llplugin/llmedia test apps."
)
endif
(
USESYSTEMLIBS
)
endif
(
USESYSTEMLIBS
)
...
...
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