Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Maik Froechtenicht
glew
Commits
0b396919
Commit
0b396919
authored
Nov 17, 2017
by
dimitri
Committed by
Nigel Stewart
Nov 19, 2017
Browse files
Building 32-bit binaries on 64-bit linux machines now supported.
parent
ee302648
Changes
4
Hide whitespace changes
Inline
Side-by-side
build/conan/.gitignore
View file @
0b396919
...
...
@@ -15,3 +15,4 @@ test_package/build
conanfile.pyc
conaninfo.txt
conanbuildinfo.cmake
conanbuildinfo.txt
build/conan/build.py
View file @
0b396919
...
...
@@ -4,9 +4,4 @@ import os, platform
if
__name__
==
"__main__"
:
builder
=
ConanMultiPackager
(
args
=
"--build missing"
)
builder
.
add_common_builds
()
filtered_builds
=
[]
for
settings
,
options
,
env_vars
,
build_requires
in
builder
.
builds
:
if
not
(
settings
[
"arch"
]
==
"x86"
):
filtered_builds
.
append
([
settings
,
options
,
env_vars
,
build_requires
])
builder
.
builds
=
filtered_builds
builder
.
run
()
build/conan/conanfile.py
View file @
0b396919
import
os
from
conans
import
ConanFile
,
CMake
from
conans.tools
import
os_info
,
SystemPackageTool
,
ConanException
from
conans.tools
import
os_info
,
SystemPackageTool
,
ConanException
,
replace_in_file
from
conans
import
tools
,
VisualStudioBuildEnvironment
from
conans.tools
import
build_sln_command
,
vcvars_command
,
download
,
unzip
...
...
@@ -33,14 +33,20 @@ class GlewConan(ConanFile):
installer
.
install
(
"libxi-dev"
)
installer
.
install
(
"libgl-dev"
)
installer
.
install
(
"libosmesa-dev"
)
installer
.
install
(
"libglu1-mesa-dev"
)
if
self
.
settings
.
arch
==
"x86"
and
tools
.
detected_architecture
()
==
"x86_64"
:
installer
.
install
(
"libglu1-mesa-dev:i386"
)
else
:
installer
.
install
(
"libglu1-mesa-dev"
)
elif
os_info
.
with_yum
:
installer
=
SystemPackageTool
()
if
self
.
version
==
"master"
:
installer
.
install
(
"libXmu-devel"
)
installer
.
install
(
"libXi-devel"
)
installer
.
install
(
"libGL-devel"
)
installer
.
install
(
"mesa-libGLU-devel"
)
if
self
.
settings
.
arch
==
"x86"
and
tools
.
detected_architecture
()
==
"x86_64"
:
installer
.
install
(
"mesa-libGLU-devel.i686"
)
else
:
installer
.
install
(
"mesa-libGLU-devel"
)
else
:
self
.
output
.
warn
(
"Could not determine Linux package manager, skipping system requirements installation."
)
...
...
@@ -71,6 +77,12 @@ class GlewConan(ConanFile):
if
self
.
version
==
"master"
:
self
.
run
(
"make extensions"
)
replace_in_file
(
"%s/build/cmake/CMakeLists.txt"
%
self
.
source_directory
,
"include(GNUInstallDirs)"
,
"""
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()
include(GNUInstallDirs)
"""
)
cmake
=
CMake
(
self
)
cmake
.
configure
(
source_dir
=
"%s/build/cmake"
%
self
.
source_directory
,
defs
=
{
"BUILD_UTILS"
:
"OFF"
})
cmake
.
build
()
...
...
build/conan/test_package/conanfile.py
View file @
0b396919
...
...
@@ -7,8 +7,8 @@ class TestGlew(ConanFile):
def
build
(
self
):
cmake
=
CMake
(
self
)
self
.
run
(
'cmake "%s" %s'
%
(
self
.
conanfile_directory
,
cmake
.
command_line
)
)
self
.
run
(
"cmake --build . %s"
%
cmake
.
build
_config
)
cmake
.
configure
(
)
cmake
.
build
(
)
def
test
(
self
):
self
.
run
(
os
.
sep
.
join
([
"."
,
"bin"
,
"testGlew"
]))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment