From a89c70ae84911c61c076c83dc1fa36d7bf9595ba Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Wed, 26 Jan 2011 19:22:27 +0000 Subject: [PATCH] Fixed the linking of the BMWlibs under Cygwin by adding explicitly "-lgomp" to the linker-flags which seems to be necessary for Cygwin and does not hurt under GNU/Linux. --- ChangeLog | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70a8d0dc..06545dd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ NEW any2many: an attempt to write the universial musr-data-file converter. Just NEW musrt0: added the possibility to show the t0 saved in the data file 's'. Furthermore added the option --getT0FromPromptPeak, -g with : will, in non-interactive mode estimate the t0's from the prompt peak and write it into the msr-file (MUSR-133). +FIXED linking of BMWlibs on Cygwin FIXED various bugs in msr2data FIXED 2 little annoying problems: (i) now it is possible to zoom down to the single bin in musrview. (ii) when switching between data- and difference-view, the x-range doesn't change anymore. diff --git a/configure.ac b/configure.ac index 785920e6..ac27df4b 100644 --- a/configure.ac +++ b/configure.ac @@ -490,7 +490,7 @@ if test "${BUILD_BMW_LIBS}" = "1"; then SAVED_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fopenmp" SAVED_LIBSS="$LIBS" - LIBS="$LIBS -fopenmp" + LIBS="$LIBS -fopenmp -lgomp" AC_SEARCH_LIBS([omp_get_num_procs], [gomp], [AC_DEFINE([HAVE_GOMP], [1], [Define to 1 if gomp is available])], [CXXFLAGS="$SAVED_CXXFLAGS" LIBS="$SAVED_LIBS"], []) fi