[msvc] updated build scripts

contrib/build/msvc/build.cmd

@@ -45,9 +45,9 @@ IF %Platform% EQU x64 (
 	set VS_CMAKE=%VS_CMAKE% Win64
 )
 
-IF NOT EXIST %CMAKE_DIR%\bin\cmake.exe (
+IF NOT EXIST %CMAKE_EXE% (
 	echo.
-	echo.ERROR: CMake not found: %CMAKE_DIR%\bin\cmake.exe
+	echo.ERROR: CMake not found: %CMAKE_EXE%
 	echo.
 	goto error_end
 )
@@ -129,11 +129,11 @@ IF NOT EXIST zlib-%ZLIB_COMMIT%.build (
     mkdir zlib-%ZLIB_COMMIT%.build
     
     pushd zlib-%ZLIB_COMMIT%.build
-	%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\zlib-%ZLIB_COMMIT%
+	%CMAKE_EXE% -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\zlib-%ZLIB_COMMIT%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+	%CMAKE_EXE% --build . --config %Configuration%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+	%CMAKE_EXE% --build . --config %Configuration% --target install
 	IF errorlevel 1 goto error_end
     
     popd
@@ -151,11 +151,11 @@ IF NOT EXIST expat-2.1.0.build (
     mkdir expat-2.1.0.build
     
     pushd expat-2.1.0.build
-	%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\expat-2.1.0
+	%CMAKE_EXE% -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% ..\expat-2.1.0
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+	%CMAKE_EXE% --build . --config %Configuration%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+	%CMAKE_EXE% --build . --config %Configuration% --target install
 	IF errorlevel 1 goto error_end
 	popd
 )
@@ -176,11 +176,11 @@ REM REM IF NOT EXIST OpenSSL-%SSL_COMMIT%.build (
 REM REM     mkdir OpenSSL-%SSL_COMMIT%.build
 REM     
 REM     pushd OpenSSL-%SSL_COMMIT%
-REM 	%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% .
+REM 	%CMAKE_EXE% -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% .
 REM 	IF errorlevel 1 goto error_end
-REM 	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+REM 	%CMAKE_EXE% --build . --config %Configuration%
 REM 	IF errorlevel 1 goto error_end
-REM 	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+REM 	%CMAKE_EXE% --build . --config %Configuration% --target install
 REM 	IF errorlevel 1 goto error_end
 REM     
 REM REM     popd
@@ -218,11 +218,11 @@ IF NOT EXIST curl-%CURL_COMMIT%.build (
     mkdir curl-%CURL_COMMIT%.build
     
     pushd curl-%CURL_COMMIT%.build
-	%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_PREFIX_PATH=..\%OPENSSL_LONG% -DBUILD_CURL_TESTS=OFF -DCMAKE_USE_OPENSSL=ON -DCMAKE_USE_LIBSSH2=OFF ..\curl-%CURL_COMMIT%
+	%CMAKE_EXE% -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_PREFIX_PATH=..\%OPENSSL_LONG% -DBUILD_CURL_TESTS=OFF -DCMAKE_USE_OPENSSL=ON -DCMAKE_USE_LIBSSH2=OFF ..\curl-%CURL_COMMIT%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+	%CMAKE_EXE% --build . --config %Configuration%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+	%CMAKE_EXE% --build . --config %Configuration% --target install
 	IF errorlevel 1 goto error_end
     
     popd
@@ -240,19 +240,18 @@ IF NOT EXIST libssh-%SSH_VERSION%.build (
     
     pushd libssh-%SSH_VERSION%.build
 	
-	%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DWITH_GSSAPI=OFF -DWITH_ZLIB=ON -DWITH_SFTP=ON -DWITH_SERVER=OFF -DWITH_EXAMPLES=OFF -DWITH_NACL=OFF -DCMAKE_PREFIX_PATH=..\%OPENSSL_LONG% -DWITH_PCAP=OFF -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR%  ..\libssh-%SSH_VERSION%
+	%CMAKE_EXE% -G "%VS_CMAKE%" -DWITH_GSSAPI=OFF -DWITH_ZLIB=ON -DWITH_SFTP=ON -DWITH_SERVER=OFF -DWITH_EXAMPLES=OFF -DWITH_NACL=OFF -DCMAKE_PREFIX_PATH=..\%OPENSSL_LONG% -DWITH_PCAP=OFF -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR%  ..\libssh-%SSH_VERSION%
 
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+	%CMAKE_EXE% --build . --config %Configuration%
 	IF errorlevel 1 goto error_end
-	%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+	%CMAKE_EXE% --build . --config %Configuration% --target install
 	IF errorlevel 1 goto error_end
     
     popd
 )
 
 
-
 IF NOT EXIST %EXIV_DIR% (
     %CYGWIN_DIR%\bin\svn.exe co svn://dev.exiv2.org/svn/trunk %EXIV_DIR%
 ) ELSE (
@@ -265,13 +264,13 @@ IF NOT EXIST %EXIV_DIR%.build (
     
 pushd %EXIV_DIR%.build
 
-%CMAKE_DIR%\bin\cmake.exe -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_PROGRAM_PATH=%SVN_DIR% -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_BUILD_SAMPLES=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON -DEXIV2_ENABLE_NLS=ON -DEXIV2_ENABLE_WIN_UNICODE=ON -DEXIV2_ENABLE_SHARED=ON ..\%EXIV_DIR%
+%CMAKE_EXE% -G "%VS_CMAKE%" -DCMAKE_INSTALL_PREFIX=..\%INSTALL_DIR% -DCMAKE_PROGRAM_PATH=%SVN_DIR% -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_BUILD_SAMPLES=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON -DEXIV2_ENABLE_NLS=ON -DEXIV2_ENABLE_WIN_UNICODE=ON -DEXIV2_ENABLE_SHARED=ON ..\%EXIV_DIR%
 
 IF errorlevel 1 goto error_end
 
-%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration%
+%CMAKE_EXE% --build . --config %Configuration%
 IF errorlevel 1 goto error_end
-%CMAKE_DIR%\bin\cmake.exe --build . --config %Configuration% --target install
+%CMAKE_EXE% --build . --config %Configuration% --target install
 IF errorlevel 1 goto error_end
 popd  
 goto end

contrib/build/msvc/setenv.cmd

@@ -8,7 +8,7 @@ REM ---------------------------------------------------
 SET CYGWIN_DIR=c:\cygwin64
 SET TEMP_DIR=.downloaddir
 
-SET CMAKE_DIR=C:\Data\Programs\cmake-3.3.2-win32-x86
+SET CMAKE_EXE=C:\Data\Programs\cmake-3.3.2-win32-x86\bin\cmake.exe
 
 SET SVN_DIR=C:\Data\Programs\Apache-Subversion-1.8.13\bin
 
@@ -19,8 +19,13 @@ REM Options:  -------------------------------------------
 REM enable another configuration (defaulting to Release)
 REM SET Configuration=Debug
 
-
-IF DEFINED VS120COMNTOOLS (
+IF DEFINED VS140COMNTOOLS (
+	REM Visual Studio 2015
+	set VS_SHORT=vc14
+	set VS_CMAKE=Visual Studio 14
+	set VS_PROG_FILES=Microsoft Visual Studio 14.0
+	set VS_OPENSSL=vs2015
+) ELSE IF DEFINED VS120COMNTOOLS (
 	REM Visual Studio 2013
 	set VS_SHORT=vc12
 	set VS_CMAKE=Visual Studio 12