minizip fixes for msvc and cmake

[lyx.git] / development / cmake / build.bat

diff --git a/development/cmake/build.bat b/development/cmake/build.bat
index eaa36c6ad062f9bb04a11c7f0367aaca3a5f287f..bb0a6511a4e59d50c06812bcfce42e587e81c754 100755 (executable)
--- a/development/cmake/build.bat
+++ b/development/cmake/build.bat
@@ -1,5 +1,5 @@
 :: be sure there is a solution\r
-cmake ..\trunk\development\cmake\r
+cmake ..\trunk\development\cmake -Dmerge=1\r
 \r
 :: clean\r
 devenv lyx-qt4.sln /clean Release\r