Merge pull request #606 from apathyboy/master

Regression fix for building mysql connectors
anhstudios · Jul 8, 2013 · 5aaab59 · 5aaab59
2 parents 7afb92e + 6f04a0b
commit 5aaab59
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/build_deps.bat b/build_deps.bat
@@ -320,11 +320,11 @@ if not exist "%MYSQL_C_DIR%" (
 
 cd "%MYSQL_C_DIR%"
 
-cmake -G"Visual Studio 11" .
-cmake --build . --target mysqlclient --config Debug
-cmake --build . --target libmysql --config Debug
-cmake --build . --target mysqlclient --config Release
-cmake --build . --target libmysql --config Release
+cmake -G"Visual Studio %MSVC_VERSION%" .
+cmake --build . --target libmysql/mysqlclient --config Debug
+cmake --build . --target libmysql/libmysql --config Debug
+cmake --build . --target libmysql/mysqlclient --config Release
+cmake --build . --target libmysql/libmysql --config Release
 
 if not exist "%VENDOR_DIR%include\mysql.h" (
     xcopy "include" "%VENDOR_DIR%include" /s /i /y
@@ -351,9 +351,9 @@ if not exist mysql-connector-cpp (
 
 cd mysql-connector-cpp
 
-cmake -G"Visual Studio 11" -DDISABLE_ITERATOR_DEBUGGING=ON -DBOOST_ROOT=%VENDOR_DIR% -DMYSQL_INCLUDE_DIR=%VENDOR_DIR%include -DMYSQL_LIB_DIR=%VENDOR_DIR%lib/Release .
-cmake --build . --target mysqlcppconn --config Debug
-cmake --build . --target mysqlcppconn --config Release
+cmake -G"Visual Studio %MSVC_VERSION%" -DDISABLE_ITERATOR_DEBUGGING=ON -DBOOST_ROOT=%VENDOR_DIR% -DMYSQL_INCLUDE_DIR=%VENDOR_DIR%include -DMYSQL_LIB_DIR=%VENDOR_DIR%lib/Release .
+cmake --build . --target driver/mysqlcppconn --config Debug
+cmake --build . --target driver/mysqlcppconn --config Release
 
 if not exist "%VENDOR_DIR%include\cppconn" (
     xcopy "cppconn" "%VENDOR_DIR%include\cppconn" /s /i /y