Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
bob
bob.core
Commits
89616b11
Commit
89616b11
authored
11 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
Changes for Linux compilation
parent
06e30ea0
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
buildout.cfg
+1
-1
1 addition, 1 deletion
buildout.cfg
setup.py
+10
-5
10 additions, 5 deletions
setup.py
with
11 additions
and
6 deletions
buildout.cfg
+
1
−
1
View file @
89616b11
...
@@ -8,7 +8,7 @@ eggs = xbob.core
...
@@ -8,7 +8,7 @@ eggs = xbob.core
ipdb
ipdb
extensions
=
mr.developer
extensions
=
mr.developer
auto-checkout
=
*
auto-checkout
=
*
prefixes
=
/
Users/andre/work
/bob/b/dbg
prefixes
=
/
scratch/aanjos
/bob/b/dbg
[sources]
[sources]
pypkg
=
git git@github.com:anjos/pypkg
pypkg
=
git git@github.com:anjos/pypkg
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
10
−
5
View file @
89616b11
...
@@ -11,6 +11,7 @@ dist.Distribution(dict(setup_requires=['pypkg', 'numpy', 'blitz.array']))
...
@@ -11,6 +11,7 @@ dist.Distribution(dict(setup_requires=['pypkg', 'numpy', 'blitz.array']))
import
pypkg
import
pypkg
import
numpy
import
numpy
import
blitz
import
blitz
import
platform
# Minimum version requirements for pkg-config packages
# Minimum version requirements for pkg-config packages
MINIMAL_BLITZ_VERSION_REQUIRED
=
'
0.10
'
MINIMAL_BLITZ_VERSION_REQUIRED
=
'
0.10
'
...
@@ -26,7 +27,12 @@ if bob_pkg < MINIMAL_BOB_VERSION_REQUIRED:
...
@@ -26,7 +27,12 @@ if bob_pkg < MINIMAL_BOB_VERSION_REQUIRED:
raise
RuntimeError
(
"
This package requires Bob %s or superior, but you have %s
"
%
(
MINIMAL_BOB_VERSION_REQUIRED
,
bob_pkg
.
version
))
raise
RuntimeError
(
"
This package requires Bob %s or superior, but you have %s
"
%
(
MINIMAL_BOB_VERSION_REQUIRED
,
bob_pkg
.
version
))
# Make-up the names of versioned Bob libraries we must link against
# Make-up the names of versioned Bob libraries we must link against
bob_libraries
=
[
'
%s.%s
'
%
(
k
,
bob_pkg
.
version
)
for
k
in
bob_pkg
.
libraries
()]
if
platform
.
system
()
==
'
Darwin
'
:
bob_libraries
=
[
'
%s.%s
'
%
(
k
,
bob_pkg
.
version
)
for
k
in
bob_pkg
.
libraries
()]
elif
platform
.
system
()
==
'
Linux
'
:
bob_libraries
=
[
'
:lib%s.so.%s
'
%
(
k
,
bob_pkg
.
version
)
for
k
in
bob_pkg
.
libraries
()]
else
:
raise
RuntimeError
(
"
This package currently only supports MacOSX and Linux builds
"
)
# Add system include directories
# Add system include directories
extra_compile_args
=
[]
extra_compile_args
=
[]
...
@@ -47,7 +53,6 @@ if StrictVersion(numpy.__version__) >= StrictVersion('1.7'):
...
@@ -47,7 +53,6 @@ if StrictVersion(numpy.__version__) >= StrictVersion('1.7'):
define_macros
.
append
((
"
NPY_NO_DEPRECATED_API
"
,
"
NPY_1_7_API_VERSION
"
))
define_macros
.
append
((
"
NPY_NO_DEPRECATED_API
"
,
"
NPY_1_7_API_VERSION
"
))
# Compilation options
# Compilation options
import
platform
if
platform
.
system
()
==
'
Darwin
'
:
if
platform
.
system
()
==
'
Darwin
'
:
extra_compile_args
+=
[
'
-std=c++11
'
,
'
-Wno-#warnings
'
]
extra_compile_args
+=
[
'
-std=c++11
'
,
'
-Wno-#warnings
'
]
else
:
else
:
...
@@ -85,7 +90,7 @@ setup(
...
@@ -85,7 +90,7 @@ setup(
"
xbob/core/convert.cpp
"
,
"
xbob/core/convert.cpp
"
,
],
],
define_macros
=
define_macros
,
define_macros
=
define_macros
,
include_dirs
=
bob_pkg
.
include_directories
(),
include_dirs
=
bob_pkg
.
include_directories
(),
extra_compile_args
=
extra_compile_args
,
extra_compile_args
=
extra_compile_args
,
library_dirs
=
bob_pkg
.
library_directories
(),
library_dirs
=
bob_pkg
.
library_directories
(),
runtime_library_dirs
=
bob_pkg
.
library_directories
(),
runtime_library_dirs
=
bob_pkg
.
library_directories
(),
...
@@ -97,7 +102,7 @@ setup(
...
@@ -97,7 +102,7 @@ setup(
"
xbob/core/logging.cpp
"
,
"
xbob/core/logging.cpp
"
,
],
],
define_macros
=
define_macros
,
define_macros
=
define_macros
,
include_dirs
=
bob_pkg
.
include_directories
(),
include_dirs
=
bob_pkg
.
include_directories
(),
extra_compile_args
=
extra_compile_args
,
extra_compile_args
=
extra_compile_args
,
library_dirs
=
bob_pkg
.
library_directories
(),
library_dirs
=
bob_pkg
.
library_directories
(),
runtime_library_dirs
=
bob_pkg
.
library_directories
(),
runtime_library_dirs
=
bob_pkg
.
library_directories
(),
...
@@ -115,5 +120,5 @@ setup(
...
@@ -115,5 +120,5 @@ setup(
'
Programming Language :: Python :: 3
'
,
'
Programming Language :: Python :: 3
'
,
'
Topic :: Software Development :: Libraries :: Python Modules
'
,
'
Topic :: Software Development :: Libraries :: Python Modules
'
,
],
],
)
)
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