meson updates

meson.build

@@ -38,8 +38,6 @@ cdata.set('PROJECT_VERSION', '@0@.@1@'.format(meson.project_version(), cdata.get
 cdata.set('EXV_PACKAGE_VERSION', '@0@.@1@'.format(meson.project_version(), cdata.get('PROJECT_VERSION_TWEAK')))
 cdata.set('EXV_PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), cdata.get('PROJECT_VERSION')))
 
-cdata.set('EXV_HAVE_MMAP', cpp.has_function('mmap'))
-cdata.set('EXV_HAVE_MUNMAP', cpp.has_function('munmap'))
 cdata.set('EXV_HAVE_STRERROR_R', cpp.has_function('strerror_r'))
 cdata.set('EXV_STRERROR_R_CHAR_P', not cpp.compiles('#include <string.h>\nint strerror_r(int,char*,size_t);int main(){}'))
 
@@ -341,4 +339,53 @@ executable(
   install: true,
 )
 
+samples = {
+  'addmoddel': [],
+  'conntest': curl_dep,
+  'convert-test': [],
+  'easyaccess-test': [],
+  'exifcomment': [],
+  'exifdata-test': [],
+  'exifdata': [],
+  'exifprint': [],
+  'exifvalue': [],
+  'geotag': expat_dep,
+  'ini-test': inih_dep,
+  'iotest': [],
+  'iptceasy': [],
+  'iptcprint': [],
+  'iptctest': [],
+  'key-test': [],
+  'largeiptc-test': [],
+  'mmap-test': [],
+  'mrwthumb': [],
+  'prevtest': [],
+  'remotetest': [],
+  'stringto-test': [],
+  'taglist': [],
+  'tiff-test': [],
+  'write-test': [],
+  'write2-test': [],
+  'xmpparse': [],
+  'xmpparser-test': [],
+  'xmpprint': [],
+  'xmpsample': [],
+  'xmpdump': [],
+}
+
+foreach s, d : samples
+  executable(s, 'samples/@[email protected]'.format(s), dependencies: [exiv2_dep, d], include_directories: exiv2inc)
+endforeach
+
+gopt = [
+ 'getopt-test',
+ 'metacopy',
+ 'path-test',
+]
+
+ginc = include_directories('app')
+foreach g : gopt
+  executable(g, 'samples/@[email protected]'.format(g), 'app/getopt.cpp', dependencies: exiv2_dep, include_directories: [exiv2inc, ginc])
+endforeach
+
 subdir('unitTests')

samples/geotag.cpp

@@ -8,9 +8,16 @@
 #include <sys/types.h>
 
 #include <algorithm>
-#include <filesystem>
 #include <iostream>
 
+#if __has_include(<filesystem>)
+#include <filesystem>
+namespace fs = std::filesystem;
+#else
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#endif
+
 using namespace std;
 
 #ifdef _WIN32
@@ -795,7 +802,7 @@ int main(int argc, const char* argv[]) {
           printf("%s %s ", arg, types[type]);
         if (type == typeImage) {
           time_t t = readImageTime(std::string(arg));
-          auto p = std::filesystem::absolute(std::filesystem::path(arg));
+          auto p = fs::absolute(fs::path(arg));
           std::string path = p.string();
           if (t && !path.empty()) {
             if (options.verbose)

tests/runner.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import argparse
@@ -64,7 +65,7 @@ def shouldIncludeMethod(attrname):
 
     args          = parser.parse_args()
     if 'VERBOSE' in os.environ:
-        args.verbose = 2 
+        args.verbose = 2
     conf_file     = args.config_file[0]
     DEFAULT_ROOT  = os.path.abspath(os.path.dirname(conf_file))
     system_tests.set_debug_mode(args.debug)