From 98a61f5b8da500fcefd2e7f0dfb1231bfb87f2fb Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 6 Jul 2015 22:18:52 +0200 Subject: [PATCH] Expose devenv make file variable Change-Id: I502ce280276b6430053f0fbcf9cc3248b6c9b11b Reviewed-on: https://gerrit.libreoffice.org/16801 Tested-by: Jenkins Reviewed-by: Michael Stahl --- config_host.mk.in | 1 + configure.ac | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 2a20b8bfdd51..63b10d56763d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -613,6 +613,7 @@ export UUIDGEN=@UUIDGEN@ export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@ export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@ export VCVER=@VCVER@ +export DEVENV=@DEVENV@ export VERBOSE=@VERBOSE@ export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@ export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@ diff --git a/configure.ac b/configure.ac index aaf1d6a6085c..87d9d76252c1 100644 --- a/configure.ac +++ b/configure.ac @@ -3517,6 +3517,7 @@ find_msvc() SHOWINCLUDES_PREFIX= MSBUILD_PATH= +DEVENV= if test "$_os" = "WINNT"; then if test "$WITH_MINGW" != "yes"; then AC_MSG_CHECKING([Visual C++]) @@ -3565,6 +3566,12 @@ if test "$_os" = "WINNT"; then MSBUILD_PATH=`win_short_path_for_make "$regvalue"` 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 Check for the corresponding mspdb*.dll dnl =========================================================== @@ -3746,6 +3753,7 @@ if test "$_os" = "WINNT"; then fi fi AC_SUBST(VCVER) +AC_SUBST(DEVENV) PathFormat "$MSPDB_PATH" MSPDB_PATH="$formatted_path" AC_SUBST(SHOWINCLUDES_PREFIX)