#11 Integrating fix into master (accidentally lost on 2017-08-07 by rebase -force)

contrib/cmake/msvc/ReadMe.txt

@@ -20,7 +20,7 @@ How to use this
 1 Setting up your machine
   You need cmake.exe, svn.exe and 7z.exe on your PATH.
 
-  Please get "Windows" versions of cmake/svn/7z etc (NOT Cygwin or MinGW versions)
+  Please get "Windows" versions of cmake/svn/7z (NOT Cygwin or MinGW versions)
 
   You should initialize the Visual Studio environment
   using the version of vcvars32.bat or vcvarsall.bat
@@ -36,19 +36,19 @@ How to use this
   vcvars 2010 64     # sets 2010 x86_amd64
 
 2 Always build "out of source".  I recommend:
-  cd <exiv2dir>
+  cd <exiv2dir>\contrib\cmake\cmake
-  mkdir build
+  cmd.exe
+  vcvars 2015 64
+  cmakeBuild --help           # display syntax and options 
+  cmakeBuild --rebuild
+  ....
+  exit
 
   +-------------------------------------------------------+
   | Never attempt to build in a directory with a space in |
   | the path name.  Example c:\My Build Tree\exiv2\build  |
   +-------------------------------------------------------+
 
-  Ensure that cmakeBuild.cmd and cmakeDefaults.cmd are on your path (eg your build directory)
-  copy  contrib\cmake\msvc\* build
-  cd    build
-  cmakeBuild --help
-
   You should never have reason to modify the code in cmakeBuild.cmd
   You may wish to change the defaults in cmakeDefaults.cmd
   You can change the defaults on the command-line (or modify cmakeDefaults.cmd)
@@ -66,14 +66,14 @@ How to use this
   cmakeBuild --silent
 
 3 What gets built?
-  The build is performed in  build\temp
+  The build is performed in  work
-  The output is generated in build\dist
+  The output is generated in dist
-                             build\dist\..mumble..\bin contains *.exe and *.dll files
+                             dist\..mumble..\bin contains *.exe and *.dll files
-                             build\dist\..mumble..\lib contains *.lib files
+                             dist\..mumble..\lib contains *.lib files
-                             build\dist\..mumble..\include contains *.h and *.hpp files
+                             dist\..mumble..\include contains *.h and *.hpp files
 
   mumble identifies the compiler and build.
-  Example C:\gnu\exiv2\build\dist\2013\x64\dll\Release\bin
+  Example C:\gnu\github\exiv2\contrib\cmake\msvc\dist\2013\x64\dll\Release\bin
   2013    = Visual Studio      Choices: 2005/2008/2010/2012/2013/2015
   x64     = 64 bit build                Win32/x64
   dll     = shared library              dll/static

contrib/cmake/msvc/cmakeBuild.cmd

@@ -17,6 +17,7 @@ if /I "%1" == "--zlib"            set "_ZLIB_=%2"& shift
 
 if /I "%1" == "--help"            call:Help && goto end
 if /I "%1" == "--dryrun"          set "_DRYRUN_=1"
+if /I "%1" == "--nosamples"       set "_NOSAMPLES_=1"
 if /I "%1" == "--pause"           set "_PAUSE_=1"
 if /I "%1" == "--rebuild"         set "_REBUILD_=1"
 if /I "%1" == "--silent"          set "_SILENT_=1"
@@ -212,7 +213,11 @@ call:buildLib %_ZLIB_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_%
 
 echo ---------- EXPAT building with cmake -----------------
 set "_TARGET_=--target expat"
-call:buildLib %_EXPAT_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_%
+if /I "%_MODE_%" == "static" (
+  call:buildLib %_EXPAT_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DBUILD_shared=0 -DCMAKE_C_FLAGS_RELEASE=/MT -DBUILD_examples=0 -DBUILD_tests=0
+) else (
+  call:buildLib %_EXPAT_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% 
+)
 set  _TARGET_=
 
 if DEFINED _WEBREADY_ (
@@ -282,11 +287,13 @@ pushd        "%EXIV_B%"
 	    set ENABLE_SHARED=OFF
 	    set ENABLE_DYNAMIC=OFF
 	)
+	                        set BUILD_SAMPLES=ON
+	if DEFINED _NOSAMPLES_  set BUILD_SAMPLES=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_NLS=OFF                -DEXIV2_ENABLE_BUILD_SAMPLES=%BUILD_SAMPLES% ^
               -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=%ENABLE_SHARED% ^
-              -DEXIV2_ENABLE_DYNAMIC_RUNTIME=%ENABLE_DYNAMIC%                  ^
+              -DEXIV2_ENABLE_DYNAMIC_RUNTIME=%ENABLE_DYNAMIC% ^
               %ENABLE_WEBREADY%  %ENABLE_CURL%  %ENABLE_LIBSSH% %ENABLE_VIDEO% ^
              "%_EXIV2_%"
 

contrib/cmake/msvc/cmakeDefaults.cmd

@@ -5,7 +5,7 @@ rem use environment strings to set defaults which will not be clobbered by this
 
 if not defined _CONFIG_      SET _CONFIG_=Release
 if NOT DEFINED _WORK_        SET _WORK_=work
-if NOT DEFINED _EXIV2_       SET _EXIV2_=..\trunk
+if NOT DEFINED _EXIV2_       SET _EXIV2_=..\..\..
 if NOT DEFINED _CURL_        SET _CURL_=curl-7.45.0
 if NOT DEFINED _LIBSSH_      SET _LIBSSH_=libssh-0.7.2
 if NOT DEFINED _OPENSSL_     SET _OPENSSL_=openssl-1.0.1p

src/CMakeLists.txt

@@ -257,6 +257,11 @@ ENDIF()
 target_include_directories(exiv2lib PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
 
 if ( MSVC )
+    if ( EXIV2_ENABLE_STATIC )
+        TARGET_LINK_LIBRARIES( exiv2lib zlibstatic ${ZLIB_LIBRARIES} )
+    else()
+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ZLIB_LIBRARIES} )
+    endif()
     source_group("Header Files" FILES ${LIBEXIV2_HDR} )
     TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${ZLIB_LIBRARIES} )
     TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )