Commit 980fa05e authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

Modify the order of libraries in SCons: read first the third party ones and...

 Modify the order of libraries in SCons: read first the third party ones and only then HappyHeart ones. The opposite worked on Mac probably due to the fact shared libraries were used...
parent e49206a1
......@@ -7,7 +7,7 @@
# include "Model/Model.hpp"
# include "FiniteElement/LocalVariationalOperators/MatrixAndVector/Hyperelasticity/HyperElasticLaws/CiarletGeymonat.hpp"
# include "FiniteElement/LocalVariationalOperators/MatrixAndVector/Hyperelasticity/HyperelasticLaws/CiarletGeymonat.hpp"
# include "Problems/Hyperelasticity/VariationalFormulationHyperElasticity.hpp"
......@@ -39,8 +39,6 @@ namespace HappyHeart
typedef VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT> VariationalFormulation;
typedef typename VariationalFormulation::GlobalVariationalOperatorTuple GlobalVariationalOperatorTuple;
public:
//! Return the name of the model.
......
......@@ -14,7 +14,7 @@ TimeSchemes/Midpoint/VectorsAndMatrices.cpp
hyperelasticity = env.Program('hyperelasticity', main_src,
LIBS=all_libs,
LIBPATH=env['LIBPATH'])
LIBS=all_libs,
LIBPATH=env['LIBPATH'])
Return('hyperelasticity')
\ No newline at end of file
Return('hyperelasticity')
......@@ -72,10 +72,7 @@ namespace HappyHeart
public:
//! Convenient typedef to the type of the tuple which contains all global variational operators.
typedef GlobalVariationalOperatorTuple<LawPolicyT, TimeSchemeT> GlobalVariationalOperatorTuple;
//! Typedef to shared_ptr.
typedef std::shared_ptr<VariationalFormulationHyperElasticity<LawPolicyT, TimeSchemeT>> shared_ptr;
......
......@@ -3,7 +3,7 @@ import copy
import subprocess
# Set the variables from the configuration file for the command line (the latter supercedes the former).
configuration_file = 'build_configuration.py'
configuration_file = 'build_configuration_linux.py'
assert os.path.isfile(configuration_file)
vars = Variables(configuration_file)
vars.Add(EnumVariable('MODE', 'Whether you compile in debug or release mode.', 'debug',
......@@ -241,7 +241,8 @@ for library in libraries:
# Update the list of known libraries so far.
happy_heart_libs.append(libname)
all_libs.append(libname)
all_libs = [libname] + all_libs
# Now create the executables for all the problems.
......
import os
import copy
Import(['env', 'all_libs'])
......@@ -14,8 +14,10 @@ problems = ("Hyperelasticity", "Elasticity")
main_src = Split('''
main_test.cpp
''')
''')
print all_libs
print env['LIBPATH']
test = env.Program('test', main_src,
LIBS=all_libs,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment