Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
alta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alta
alta
Commits
3eb82600
Commit
3eb82600
authored
Jun 04, 2014
by
Laurent Belcour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating the SConscripts a bit. Updating the documentation.
parent
3f7437c1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
98 deletions
+14
-98
SConstruct
SConstruct
+6
-6
documents/install.dox
documents/install.dox
+1
-1
sources/SConstruct
sources/SConstruct
+0
-82
sources/core/SConscript
sources/core/SConscript
+4
-5
sources/plugins/SConscript
sources/plugins/SConscript
+1
-1
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
+2
-3
No files found.
SConstruct
View file @
3eb82600
...
...
@@ -91,10 +91,10 @@ env.AppendUnique(CPPPATH = ['#sources'])
##
Export
(
'env'
)
if
not
env
.
GetOption
(
'help'
):
external
=
env
.
SConscript
(
'external/SConscript'
)
external
=
env
.
SConscript
(
'external
/SConscript'
)
sources
=
env
.
SConscript
(
'source
s/SConscript'
)
#env.Depends(sources, external
)
#en
d
core
=
env
.
SConscript
(
'sources/core
/SConscript'
)
plugins
=
env
.
SConscript
(
'sources/plugins/SConscript'
)
softs
=
env
.
SConscript
(
'sources/soft
s/SConscript'
)
#sources = env.SConscript('sources/SConscript'
)
#en
v.Depends(sources, external)
documents/install.dox
View file @
3eb82600
...
...
@@ -101,7 +101,7 @@ Using scons, the compilation of ALTA is straightforward:
\verbatim
$ cd $ALTA
$ scons --cfg
[filename] -i
$ scons --cfg
=[filename]
\endverbatim
You need to provide a system dependant configuration file. You will find
...
...
sources/SConstruct
deleted
100644 → 0
View file @
3f7437c1
import
os
import
sys
## Import configuration from a config file
##
AddOption
(
'--cfg'
,
help
=
'Specify a configuration file (see config.example'
)
configFile
=
GetOption
(
'cfg'
)
if
configFile
==
None
:
configFile
=
'../config.example'
#end
if
not
os
.
path
.
exists
(
configFile
):
print
'<<ERROR>> the config file you specified does not exists'
Exit
(
1
)
#end
vars
=
Variables
(
configFile
)
vars
.
Add
(
'CXX'
,
'Compiler'
)
vars
.
Add
(
'CCFLAGS'
,
'Compiler
\'
s flags'
)
vars
.
Add
(
'LINKFLAGS'
,
'Linker
\'
s flags'
)
vars
.
Add
(
'OPENEXR_INC'
,
'OpenEXR include directory'
)
vars
.
Add
(
'OPENEXR_DIR'
,
'OpenEXR libraries directory'
)
vars
.
Add
(
'OPENEXR_LIBS'
,
'OpenEXR libraries'
)
vars
.
Add
(
'OPENMP_FLAGS'
,
'OpenMP required flags'
)
vars
.
Add
(
'OPENMP_LIBS'
,
'OpenMP libraries'
)
vars
.
Add
(
'QUADPROG_INC'
,
'QUADPROG include directory'
)
vars
.
Add
(
'QUADPROG_DIR'
,
'QUADPROG libraries directory'
)
vars
.
Add
(
'QUADPROG_LIBS'
,
'QUADPROG libraries'
)
vars
.
Add
(
'CERES_INC'
,
'CERES include directory'
)
vars
.
Add
(
'CERES_DIR'
,
'CERES libraries directory'
)
vars
.
Add
(
'CERES_LIBS'
,
'CERES libraries'
)
vars
.
Add
(
'CERES_OPT_LIBS'
,
'CERES optional libraries'
)
vars
.
Add
(
'NLOPT_INC'
,
'NLOPT include directory'
)
vars
.
Add
(
'NLOPT_DIR'
,
'NLOPT libraries directory'
)
vars
.
Add
(
'NLOPT_LIBS'
,
'NLOPT libraries'
)
vars
.
Add
(
'NLOPT_OPT_LIBS'
,
'NLOPT optional libraries'
)
vars
.
Add
(
'MATLAB_INC'
,
'MATLAB include directory'
)
vars
.
Add
(
'MATLAB_DIR'
,
'MATLAB directory'
)
vars
.
Add
(
'MATLAB_LIBS'
,
'MATLAB libraries'
)
env
=
Environment
(
variables
=
vars
)
## PLATFORM dependant section
##
if
sys
.
platform
==
'darwin'
:
# Adding the /usr/local/lib directory used to store libraries of
# MacPorts or Brew.
env
.
AppendUnique
(
LIBPATH
=
[
'/usr/local/lib'
])
env
.
AppendUnique
(
CPPPATH
=
[
'/usr/local/include'
])
env
.
AppendUnique
(
LIBPATH
=
[
'/opt/local/lib/'
])
env
.
AppendUnique
(
CPPPATH
=
[
'/opt/local/include/'
])
#end
## COMPILER dependant section
##
if
env
[
'CC'
]
in
[
'gcc'
,
'clang'
]
or
env
[
'CXX'
]
in
[
'g++'
,
'clang'
]:
print
'<<INFO>> add -fPIC option to the compiler'
env
.
AppendUnique
(
CCFLAGS
=
'-fPIC'
)
#end
## Load the configuration file if it exists. The configuration file
## is a python script that updates the env variable with different
## paths.
##
env
.
AppendUnique
(
LIBPATH
=
[
'#../external/build/lib'
])
env
.
AppendUnique
(
LIBPATH
=
[
'#./build'
])
env
.
AppendUnique
(
CPPPATH
=
[
'#../external/build/include'
])
env
.
AppendUnique
(
CPPPATH
=
[
'#./'
])
## Launch the compilations
##
Export
(
'env'
)
env
.
SConscript
(
'SConscript'
)
sources/core/SConscript
View file @
3eb82600
...
...
@@ -2,6 +2,7 @@ import os
import
sys
Import
(
'env'
)
env
=
env
.
Clone
()
# Library sources
sources
=
[
'common.cpp'
,
...
...
@@ -11,18 +12,16 @@ sources = ['common.cpp',
'rational_function.cpp'
,
'vertical_segment.cpp'
]
libs
=
[]
if
(
os
.
name
==
'posix'
):
libs
=
[
'rt'
,
'dl'
]
env
.
AppendUnique
(
LIBS
=
[
'rt'
,
'dl'
])
#end
## Known compilation issue. If the core is not compiled with -fvisibility-hidden
## on OSX, the shared libraries and the softwares cannot share vtables. This
## impact the use of dynamic_cast in shared libraries.
##
ccflags
=
[]
if
sys
.
platform
==
'darwin'
:
ccflags
=
[
'-fvisibility=hidden'
]
env
.
AppendUnique
(
CCFLAGS
=
'-fvisibility=hidden'
)
#end
env
.
StaticLibrary
(
'../build/core'
,
sources
,
LIBS
=
libs
,
CCFLAGS
=
ccflags
)
env
.
StaticLibrary
(
'../build/core'
,
sources
)
\ No newline at end of file
sources/plugins/SConscript
View file @
3eb82600
...
...
@@ -3,7 +3,7 @@ SConscript('data_merl/SConscript')
SConscript
(
'data_brdf_slice/SConscript'
)
SConscript
(
'data_interpolant/SConscript'
)
# Building nonlinear fitters
#
#
Building nonlinear fitters
SConscript
(
'nonlinear_fitter_ceres/SConscript'
)
SConscript
(
'nonlinear_fitter_nlopt/SConscript'
)
SConscript
(
'nonlinear_fitter_ipopt/SConscript'
)
...
...
sources/plugins/nonlinear_fresnel_retroschlick/SConscript
View file @
3eb82600
env
=
Environment
()
env
.
Append
(
CPPPATH
=
[
'../../../external/build/include'
,
'../../'
])
env
.
Append
(
LIBPATH
=
[
'../../../external/build/lib'
,
'../../build'
])
Import
(
'env'
)
env
=
env
.
Clone
()
sources
=
[
'function.cpp'
]
libs
=
[
'core'
]
...
...
Write
Preview
Markdown
is supported
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