Cosmetic modifications to Pull-21. Fix to ensure Cygwin uses #include <unistd.h>

config/config.h.cmake

@@ -110,6 +110,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine EXV_HAVE_UNISTD_H 1
 
+#if !defined( EXV_HAVE_UNISTD_H) && defined(__CYGWIN__)
+#define EXV_HAVE_UNISTD_H 1
+#endif
+
 // Definition to indicate if you have the <sys/mman.h> header file.
 #cmakedefine EXV_HAVE_SYS_MMAN_H
 

samples/CMakeLists.txt

@@ -1,5 +1,4 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2012-     Robin Mills      <robin@clanmills.com>
 # Copyright 2010-2012 Gilles Caulier   <caulier dot gilles at gmail dot com>
 # Copyright 2008      Patrick Spendrin <ps_ml@gmx.de>
 # Redistribution and use is allowed according to the terms of the BSD license.

src/CMakeLists.txt

@@ -206,7 +206,6 @@ SET( EXIV2_HDR            exiv2app.hpp
                           utils.hpp
 )
 
-
 # connection test application
 SET( CONNTEST             ../samples/conntest.cpp)
 # exifprint application
@@ -217,13 +216,13 @@ SET( REMOTETEST           ../samples/remotetest.cpp)
 ##
 # modify source lists to suit environment
 IF(NOT EXV_HAVE_TIMEGM )
-    SET( LIBEXIV2_SRC     ${LIBEXIV2_SRC} localtime.c    )
-    SET( EXIV2_SRC    ${EXIV2_SRC}    localtime.c    )
-    SET( PATHTEST_SRC     ${PATHTEST_SRC} localtime.c    )
+    SET( LIBEXIV2_SRC     ${LIBEXIV2_SRC} localtime.c )
+    SET(    EXIV2_SRC        ${EXIV2_SRC} localtime.c )
+    SET( PATHTEST_SRC     ${PATHTEST_SRC} localtime.c )
 ENDIF()
 
 IF( MSVC )
-    SET( EXIV2_SRC    ${EXIV2_SRC}    getopt_win32.c )
+    SET(    EXIV2_SRC        ${EXIV2_SRC} getopt_win32.c )
     SET( LIBEXIV2_SRC     ${LIBEXIV2_SRC} getopt_win32.c )
 ENDIF( MSVC )
 

xmpsdk/CMakeLists.txt

@@ -1,5 +1,4 @@
 # CMake build system for exiv2 library and executables
-# Copyright 2012-     Robin Mills      <robin@clanmills.com>
 # Copyright 2010-2012 Gilles Caulier   <caulier dot gilles at gmail dot com>
 # Copyright 2008      Patrick Spendrin <ps_ml at gmx dot de>