Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cwseaoptifol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ms-public
cwseaoptifol
Commits
2f076e7a
Commit
2f076e7a
authored
8 years ago
by
Miroslav Shaltev
Browse files
Options
Downloads
Patches
Plain Diff
Compile against lalpulsar 1.16.0.1 and NOMAD 3.8.1.
parent
79cc2546
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure.ac
+15
-2
15 additions, 2 deletions
configure.ac
src/FollowUp/Nomad/Makefile.am
+1
-1
1 addition, 1 deletion
src/FollowUp/Nomad/Makefile.am
src/SearchOptimization/Makefile.am
+2
-2
2 additions, 2 deletions
src/SearchOptimization/Makefile.am
with
18 additions
and
5 deletions
configure.ac
+
15
−
2
View file @
2f076e7a
...
...
@@ -174,12 +174,25 @@ CPPFLAGS="$CPPFLAGS $LAL_CFLAGS $LALPULSAR_CFLAGS"
# check for nomad
if test "${nomad}" = "true" ; then
PKG_CHECK_MODULES([SGTELIB],[sgtelib],[true],[false])
# do compilation checks with c++
AC_LANG_PUSH([C++])
lal_pre_sgtelib_LIBS="$LIBS"
LIBS="$LIBS $SGTELIB_LIBS"
CPPFLAGS="$CPPFLAGS $SGTELIB_CFLAGS"
lal_pre_sgtelib_VERSION="$VERSION"
AC_CHECK_HEADER([sgtelib.hpp],,[sgtelib="false"][CPPFLAGS="$lal_pre_sgtelib_CPPFLAGS" LIBS="$lal_pre_sgtelib_LIBS"],[#undef VERSION])
AC_LANG_POP([C++])
CPPFLAGS="$lal_pre_sgtelib_CPPFLAGS"
LIBS="$lal_pre_sgtelib_LIBS"
PKG_CHECK_MODULES([NOMAD],[nomad],[true],[false])
# do compilation checks with c++
AC_LANG_PUSH([C++])
lal_pre_nomad_LIBS="$LIBS"
LIBS="$LIBS $NOMAD_LIBS"
CPPFLAGS="$CPPFLAGS $NOMAD_CFLAGS"
LIBS="$LIBS $NOMAD_LIBS
$SGTELIB_LIBS
"
CPPFLAGS="$CPPFLAGS $NOMAD_CFLAGS
$SGTELIB_CFLAGS
"
lal_pre_nomad_VERSION="$VERSION"
AC_CHECK_HEADER([nomad.hpp],,[nomad="false"][CPPFLAGS="$lal_pre_nomad_CPPFLAGS" LIBS="$lal_pre_nomad_LIBS"],[#undef VERSION])
AC_LANG_POP([C++])
...
...
This diff is collapsed.
Click to expand it.
src/FollowUp/Nomad/Makefile.am
+
1
−
1
View file @
2f076e7a
...
...
@@ -2,7 +2,7 @@
# $Id$
# for using lalapps-defines + functions
AM_CPPFLAGS
+=
-I
$(
top_srcdir
)
/src/lalapps
$(
NOMAD_CFLAGS
)
AM_CPPFLAGS
+=
-I
$(
top_srcdir
)
/src/lalapps
$(
NOMAD_CFLAGS
)
$(
SGTELIB_CFLAGS
)
LDADD
=
$(
top_builddir
)
/src/lalapps/liblalapps.la
bin_PROGRAMS
=
test_nomad cwsof_FStatNomad
...
...
This diff is collapsed.
Click to expand it.
src/SearchOptimization/Makefile.am
+
2
−
2
View file @
2f076e7a
...
...
@@ -3,7 +3,7 @@
# for using lalapps-defines + functions
AM_CPPFLAGS
+=
-I
$(
top_srcdir
)
/src/lalapps
$(
NOMAD_CFLAGS
)
AM_CPPFLAGS
+=
-I
$(
top_srcdir
)
/src/lalapps
$(
SGTELIB_CFLAGS
)
$(
NOMAD_CFLAGS
)
LDADD
=
$(
top_builddir
)
/src/lalapps/liblalapps.la
bin_PROGRAMS
=
cwsof_SSDOptimizeEDS cwsof_SSDOptimize
...
...
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