equal
deleted
inserted
replaced
207 eval VS_INSTALL_DIR="\${VS_VS_INSTALLDIR_${VS_VERSION}}" |
207 eval VS_INSTALL_DIR="\${VS_VS_INSTALLDIR_${VS_VERSION}}" |
208 eval VS_EDITIONS="\${VS_EDITIONS_${VS_VERSION}}" |
208 eval VS_EDITIONS="\${VS_EDITIONS_${VS_VERSION}}" |
209 eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}" |
209 eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}" |
210 eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}" |
210 eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}" |
211 eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}" |
211 eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}" |
|
212 |
|
213 VS_ENV_CMD="" |
212 |
214 |
213 # When using --with-tools-dir, assume it points to the correct and default |
215 # When using --with-tools-dir, assume it points to the correct and default |
214 # version of Visual Studio or that --with-toolchain-version was also set. |
216 # version of Visual Studio or that --with-toolchain-version was also set. |
215 if test "x$with_tools_dir" != x; then |
217 if test "x$with_tools_dir" != x; then |
216 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], |
218 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], |
224 AC_MSG_NOTICE([Visual Studio installation. Please point to the VC/bin or VC/bin/amd64]) |
226 AC_MSG_NOTICE([Visual Studio installation. Please point to the VC/bin or VC/bin/amd64]) |
225 AC_MSG_NOTICE([directory within the Visual Studio installation]) |
227 AC_MSG_NOTICE([directory within the Visual Studio installation]) |
226 AC_MSG_ERROR([Cannot locate a valid Visual Studio installation]) |
228 AC_MSG_ERROR([Cannot locate a valid Visual Studio installation]) |
227 fi |
229 fi |
228 fi |
230 fi |
229 |
|
230 VS_ENV_CMD="" |
|
231 |
231 |
232 if test "x$VS_COMNTOOLS" != x; then |
232 if test "x$VS_COMNTOOLS" != x; then |
233 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], |
233 TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], |
234 [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable]) |
234 [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable]) |
235 fi |
235 fi |