Skip to content

Commit

Permalink
Merge pull request #118 from jpauwels/master
Browse files Browse the repository at this point in the history
Add Eigen dependency to pkg-config file
  • Loading branch information
dbogdanov authored Jul 20, 2022
2 parents 0f7214d + 8f143b9 commit 5c3fdbc
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def options(opt):

def check_tbb(conf):
tbb = conf.check_cxx(header_name = 'tbb/task_scheduler_init.h',
mandatory = 1,
errmsg = 'Intel TBB is recommended in order to compile Gaia')
mandatory = True,
errmsg = 'Intel TBB cannot be found')

if not tbb:
return
Expand All @@ -61,6 +61,7 @@ def check_tbb(conf):


def configure(conf):
conf.load('compiler_cxx compiler_c qt4')
if not sys.platform.startswith('linux') and sys.platform != 'darwin':
print('Please use the QtCreator project for building Gaia in Windows...')
sys.exit(1)
Expand Down Expand Up @@ -135,8 +136,6 @@ def configure(conf):
conf.env.CXXFLAGS = ['-static-libgcc', '-static-libstdc++']


conf.load('compiler_cxx compiler_c qt4')

#conf.env['LINKFLAGS'] += [ '--as-needed' ] # TODO do we need this flag?

# add this key otherwise gcc 4.8 will complain
Expand Down Expand Up @@ -177,6 +176,7 @@ def configure(conf):
Name: libgaia2
Description: A library for doing similarity in semimetric spaces
Version: %(version)s
Requires.private: eigen3
Libs: -L${libdir} -L${qtlibdir} -lgaia2 -lQtCore -lyaml %(tbblib)s
Cflags: -I${includedir} ${qtincludes}
''' % opts
Expand All @@ -199,6 +199,7 @@ def configure(conf):
Name: libgaia2
Description: A library for doing similarity in semimetric spaces
Version: %(version)s
Requires.private: eigen3
Libs: -L${libdir} ${qtlibdir} -lgaia2 -lyaml %(tbblib)s
Cflags: -I${includedir} ${qtincludes}
''' % opts
Expand Down

0 comments on commit 5c3fdbc

Please sign in to comment.