Fixing part of the cygwin-installation.
The shared BMWlibs cannot be built at the moment since libcuba is built static only. I am still thinking about including the C-part of Cuba into the BMWlibs if T.Hahn would not add shared library support to it.
This commit is contained in:
@ -478,8 +478,8 @@ dnl -----------------------------------------------
|
|||||||
dnl Specify the files that are going to be created by configure
|
dnl Specify the files that are going to be created by configure
|
||||||
dnl -----------------------------------------------
|
dnl -----------------------------------------------
|
||||||
|
|
||||||
AM_CONDITIONAL([BMW_OPT], [test "${BUILD_BMW_LIBS}" -eq 1])
|
AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" -eq 1])
|
||||||
AM_CONDITIONAL([AS_OPT], [test "${BUILD_AS_LIBS}" -eq 1])
|
AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" -eq 1])
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile \
|
AC_CONFIG_FILES([Makefile \
|
||||||
src/Makefile \
|
src/Makefile \
|
||||||
|
1
src/external/BMWIntegrator/BMWIntegrator.h
vendored
1
src/external/BMWIntegrator/BMWIntegrator.h
vendored
@ -36,6 +36,7 @@
|
|||||||
#include "Math/GSLMCIntegrator.h"
|
#include "Math/GSLMCIntegrator.h"
|
||||||
#include "TMath.h"
|
#include "TMath.h"
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
4
src/external/Makefile.am
vendored
4
src/external/Makefile.am
vendored
@ -1,8 +1,8 @@
|
|||||||
if AS_OPT
|
if BUILD_ASLIBS
|
||||||
ASDIRS = Nonlocal
|
ASDIRS = Nonlocal
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BMW_OPT
|
if BUILD_BMWLIBS
|
||||||
BMWDIRS = TFitPofB-lib \
|
BMWDIRS = TFitPofB-lib \
|
||||||
libLFRelaxation \
|
libLFRelaxation \
|
||||||
libGapIntegrals \
|
libGapIntegrals \
|
||||||
|
@ -5,7 +5,6 @@ macx:target.path = /Applications
|
|||||||
|
|
||||||
exists( /usr/bin/cygwin1.dll ) {
|
exists( /usr/bin/cygwin1.dll ) {
|
||||||
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
|
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
|
||||||
TARGET = musrgui.exe
|
|
||||||
}
|
}
|
||||||
|
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
Reference in New Issue
Block a user