Mentions légales du service

Skip to content
Snippets Groups Projects
Commit a37259fe authored by David Parsons's avatar David Parsons
Browse files

Properly look for openmp in build chain

parent 0e837e0e
No related branches found
No related tags found
No related merge requests found
......@@ -7,6 +7,9 @@ AC_PREREQ([2.65])
# Provide FULL-PACKAGE-NAME, VERSION and BUG-REPORT-ADDRESS
AC_INIT([AEVOL], [5.0], [aevol-bugs@lists.gforge.inria.fr], , [www.aevol.fr])
# Set C++ as the main language
AC_LANG([C++])
# Specify the location of additional local Autoconf macros
AC_CONFIG_MACRO_DIR([m4])
......@@ -26,16 +29,17 @@ if test "$test_CXXFLAGS" != set; then
fi
# Checks for programs
AC_PROG_CXX
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_RANLIB
AC_OPENMP
AM_PROG_CC_C_O
# Initialize configure-time defined flags
AC_SUBST(AEVOLCPPFLAGS, "") # C PreProcessor flags
AC_SUBST(AEVOLCXXFLAGS, "-std=c++14") # C++ Compile flags
AC_SUBST(AEVOLLDFLAGS, "") # Linker flags
AC_SUBST(AEVOLCXXFLAGS, "-std=c++14 $OPENMP_CXXFLAGS") # C++ Compile flags
AC_SUBST(AEVOLLDFLAGS, "$OPENMP_CXXFLAGS") # Linker flags
# Checks for libraries.
AC_CHECK_LIB([m], [cos], , [AC_MSG_ERROR([PACKAGE_NAME requires the math library, please install it.])])
......
......@@ -43,11 +43,7 @@ AM_CPPFLAGS += -D_FORTIFY_SOURCE=2
# LDADD = -laevol
##### #####
LDADD = $(top_srcdir)/src/libaevol/libaevol.a $(top_srcdir)/src/libaevol/SFMT-src-1.4/libsfmt.a
AM_LDFLAGS += -fopenmp
bin_PROGRAMS = aevol_run aevol_create aevol_modify aevol_propagate
......
......@@ -145,9 +145,6 @@ X11Window.cpp
# prefixed object files so that we don't use an object file built for another set of macrodefinitions
# e.g. We don't want to use an object file created with NO_X when building the X11 lib
libaevol_a_CPPFLAGS = $(AM_CPPFLAGS)
libaevol_a_CXXFLAGS = $(AM_CXXFLAGS) -fopenmp
if WITH_X
#libaevol_a_HEADERS = $(common_headers) $(X11_headers)
libaevol_a_SOURCES = $(common_sources) $(X11_sources)
......
......@@ -30,9 +30,6 @@ AM_CPPFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MA
# length-limited ones (required for debian and not a bad idea anyway).
AM_CPPFLAGS += -D_FORTIFY_SOURCE=2
## Openmp
AM_LDFLAGS += -fopenmp
############################################
# Set programs to build #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment