mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose devenv make file variable

Browse Source 
Change-Id: I502ce280276b6430053f0fbcf9cc3248b6c9b11b
Reviewed-on: https://gerrit.libreoffice.org/16801
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2015-07-06 22:18:52 +02:00
committed by Michael Stahl
parent ae4ec7a75b
commit 98a61f5b8d
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -613,6 +613,7 @@ export UUIDGEN=@UUIDGEN@
export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@ export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@ export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
export VCVER=@VCVER@ export VCVER=@VCVER@
export DEVENV=@DEVENV@
export VERBOSE=@VERBOSE@ export VERBOSE=@VERBOSE@
export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@ export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@ export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@

8
configure.ac
View File

@@ -3517,6 +3517,7 @@ find_msvc()
SHOWINCLUDES_PREFIX= SHOWINCLUDES_PREFIX=
MSBUILD_PATH= MSBUILD_PATH=
DEVENV=
if test "$_os" = "WINNT"; then if test "$_os" = "WINNT"; then
if test "$WITH_MINGW" != "yes"; then if test "$WITH_MINGW" != "yes"; then
AC_MSG_CHECKING([Visual C++]) AC_MSG_CHECKING([Visual C++])
@@ -3565,6 +3566,12 @@ if test "$_os" = "WINNT"; then
MSBUILD_PATH=`win_short_path_for_make "$regvalue"` MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
fi fi
# Find the version of devenv.exe
DEVENV="$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
if test ! -e "$DEVENV"; then
AC_MSG_ERROR([No devenv.exe found, Visual Studio installation broken?])
fi
dnl =========================================================== dnl ===========================================================
dnl Check for the corresponding mspdb*.dll dnl Check for the corresponding mspdb*.dll
dnl =========================================================== dnl ===========================================================
@@ -3746,6 +3753,7 @@ if test "$_os" = "WINNT"; then
fi fi
fi fi
AC_SUBST(VCVER) AC_SUBST(VCVER)
AC_SUBST(DEVENV)
PathFormat "$MSPDB_PATH" PathFormat "$MSPDB_PATH"
MSPDB_PATH="$formatted_path" MSPDB_PATH="$formatted_path"
AC_SUBST(SHOWINCLUDES_PREFIX) AC_SUBST(SHOWINCLUDES_PREFIX)