From 2175fdf059a287a264097364db5a22ece7fa55f2 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Fri, 17 Mar 2017 16:18:35 +0000 Subject: [PATCH] #1269 cmakeBuild.cmd --static to set cmake -DEXIV2_ENABLE_DYNAMIC_RUNTIME=OFF (and --shared will set ON) --- contrib/cmake/msvc/cmakeBuild.cmd | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd index e50b94e7..e4bb82f5 100755 --- a/contrib/cmake/msvc/cmakeBuild.cmd +++ b/contrib/cmake/msvc/cmakeBuild.cmd @@ -272,17 +272,21 @@ pushd "%EXIV_B%" set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=OFF set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=OFF set ENABLE_SHARED=ON + set ENABLE_DYNAMIC=ON if defined _CURL_ set ENABLE_CURL=-DEXIV2_ENABLE_CURL=ON if defined _LIBSSH_ set ENABLE_SSH=-DEXIV2_ENABLE_SSH=ON if defined _WEBREADY_ set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=ON if defined _VIDEO_ set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=ON - if /I "%_MODE_%" == "static" set ENABLE_SHARED=OFF - + if /I "%_MODE_%" == "static" ( + set ENABLE_SHARED=OFF + set ENABLE_DYNAMIC=OFF + ) call:run cmake -G "%_GENERATOR_%" -DCMAKE_BUILD_TYPE=%_CONFIG_% %_LINK_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% ^ -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_BUILD_SAMPLES=ON ^ -DEXIV2_ENABLE_WIN_UNICODE=OFF -DEXIV2_ENABLE_SHARED=%ENABLE_SHARED% ^ + -DEXIV2_ENABLE_DYNAMIC_RUNTIME=%ENABLE_DYNAMIC% ^ %ENABLE_WEBREADY% %ENABLE_CURL% %ENABLE_LIBSSH% %ENABLE_VIDEO% ^ "%_EXIV2_%"