Mercurial > hg > sonic-visualiser
changeset 361:101f05420cba
* Add qmake config (debug or release) corresponding to configure invocation
| author | Chris Cannam |
|---|---|
| date | Fri, 08 Oct 2010 13:31:00 +0100 |
| parents | 0f1941a756ca |
| children | a0ea7bcac15b 23f2ee395cf7 210a409e135a 84fd4bb8d656 |
| files | config.pri.in configure configure.ac |
| diffstat | 3 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/config.pri.in Fri Oct 08 12:05:36 2010 +0100 +++ b/config.pri.in Fri Oct 08 13:31:00 2010 +0100 @@ -1,3 +1,5 @@ + +CONFIG += @QMAKE_CONFIG@ DEFINES += @HAVES@
--- a/configure Fri Oct 08 12:05:36 2010 +0100 +++ b/configure Fri Oct 08 13:31:00 2010 +0100 @@ -597,6 +597,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS CODENAME +QMAKE_CONFIG HAVES CXXFLAGS_MINIMAL CUT @@ -4184,10 +4185,13 @@ CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" +QMAKE_CONFIG="release" + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : enableval=$enable_debug; { $as_echo "$as_me:${as_lineno-$LINENO}: enabling debug build" >&5 $as_echo "$as_me: enabling debug build" >&6;} +QMAKE_CONFIG="debug" CXXFLAGS_BUILD="$CXXFLAGS_DEBUG" SV_DEFINES_BUILD="$SV_DEFINES_DEBUG" fi @@ -7197,6 +7201,8 @@ + + ac_config_files="$ac_config_files config.pri" cat >confcache <<\_ACEOF
--- a/configure.ac Fri Oct 08 12:05:36 2010 +0100 +++ b/configure.ac Fri Oct 08 13:31:00 2010 +0100 @@ -51,7 +51,10 @@ CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" +QMAKE_CONFIG="release" + AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build]) +QMAKE_CONFIG="debug" CXXFLAGS_BUILD="$CXXFLAGS_DEBUG" SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"]) @@ -101,6 +104,8 @@ AC_SUBST(CC) AC_SUBST(CXX) +AC_SUBST(QMAKE_CONFIG) + AC_SUBST(CODENAME) AC_OUTPUT([config.pri])