Commit Graph

5470 Commits

Author SHA1 Message Date
Andreas Sturmlechner
40565761d1
Lowercase add_{definitions,subdirectory}, set{_*} and option macros 2017-08-22 18:21:18 +02:00
Andreas Sturmlechner
06b20523f7 Lowercase if/else/endif/foreach/endforeach 2017-08-22 18:11:46 +02:00
Luis Díaz Más
a973168ca9 Merge pull request #36 from piponazo/fixOutputDirectories
Fix output directories
2017-08-22 17:21:52 +02:00
clanmills
fcaf2be556 fix buildXMPsdk.sh to build 64 bit build of 2014. 2017-08-22 15:39:12 +01:00
clanmills
573b2cfcd2 XMPsdk fixes. 2013 and 2016 build and (mostly) pass the test suite. 2017-08-22 14:34:01 +01:00
Luis Diaz Mas
f0cb77cbdf Run tests and make install in travis 2017-08-22 14:31:46 +02:00
Luis Diaz Mas
91ca733b8d Add a new configuration to compile the project in Debug mode (Travis) 2017-08-22 14:23:13 +02:00
Luis Diaz Mas
8ba4281643 Set output directories for archives, libraries and runtime
This commit fix the problem with the test script.
2017-08-22 14:18:53 +02:00
clanmills
95c5e92365 Support for Adobe XMPsdk 2013. Build xmpsdk using Adobe scripts. 2017-08-22 09:30:41 +01:00
Luis Díaz Más
50fad7327c Merge pull request #33 from a17r/localedirundefined
LOCALEDIR is used by EXIV2_ENABLE_BUILD_PO so make sure it is defined
2017-08-22 08:20:58 +02:00
Robin Mills
20c03a5f6f Merge pull request #35 from piponazo/cmakeCompilerFlags
Move compiler flags to unique file
2017-08-21 23:14:27 +01:00
Luis Diaz Mas
90e8ad8a72 Only set CMAKE_RUNTIME_OUTPUT_DIRECTORY once 2017-08-21 23:24:19 +02:00
Luis Diaz Mas
3a45a375d8 Simplify CMake code related with PNG and ZLIB (ZLib is required is PNG=ON) 2017-08-21 23:21:57 +02:00
Luis Diaz Mas
c735bc5ae2 Relative paths to current directory 2017-08-21 23:20:04 +02:00
Luis Diaz Mas
a478a74915 Simplify CMake logic for some compiler options related to the XMP target 2017-08-21 23:19:47 +02:00
Luis Diaz Mas
3b2372e906 Remove remaining call to CMake_msvc.txt 2017-08-21 23:19:05 +02:00
Luis Diaz Mas
e07bf9ca6d Fix compiler flags on Linux 2017-08-21 23:18:27 +02:00
Luis Díaz Más
3aa77e0b87 Remove msvc macros and run that code always for the MSVC configuration 2017-08-21 23:02:11 +02:00
Luis Díaz Más
6e506a2623 Define EXIV2_ENABLE_DYNAMIC_RUNTIME only once 2017-08-21 22:39:47 +02:00
Luis Díaz Más
6a00d4b282 Move code from CMake_msvc.txt to config/compilerFlags.cmake 2017-08-21 22:39:26 +02:00
Luis Díaz Más
692f0bca9f Remove unused stuff from CMake_msvc.txt 2017-08-21 22:18:36 +02:00
Luis Díaz Más
a2bb29011d Move compiler flags configuration to a new file (config/compilerFlags.cmake).
Also define the PSAPI_VERSION only for the exiv2lib target (It's not needed for the rest of targets)
2017-08-21 22:18:36 +02:00
Luis Díaz Más
3736707015 Merge branch 'master' into localedirundefined 2017-08-21 22:07:55 +02:00
Robin Mills
6175aa4f3f Merge pull request #32 from a17r/optionalbin
Add option to disable tools (currently exiv2 binary)
2017-08-21 19:13:08 +01:00
Andreas Sturmlechner
a8e55c4d9e Drop LOCALEDIR, use CMAKE_INSTALL_LOCALEDIR directly
It is always properly defined by GNUInstallDirs. Otherwise it was
possible to install translations in / if EXIV2_ENABLE_NLS=OFF.

Thanks-to: Luis Díaz Más
2017-08-21 17:55:19 +02:00
Andreas Sturmlechner
b81f493024 Add option to disable tools (currently exiv2 binary)
In a multiarch build, one may want to build binaries only for native arch.
2017-08-21 17:20:59 +02:00
Luis Díaz Más
bedc2b3869 Merge pull request #31 from a17r/gnuinstalldirs
Use more GNUInstallDirs
2017-08-21 07:04:32 +02:00
Andreas Sturmlechner
aa6374b202
Use more GNUInstallDirs
Conveniently fixes multiarch install dir issues.
2017-08-21 00:12:33 +02:00
Robin Mills
106e35e967 Merge pull request #30 from piponazo/markdownForReadme
Use Markdown for the main readme and test travis-ci support
2017-08-20 20:28:30 +01:00
Luis Diaz Mas
1652f632d2 Code block for the README header 2017-08-20 21:23:02 +02:00
Luis Diaz Mas
c8384a776e Add image to show the travis status 2017-08-20 21:22:55 +02:00
Luis Diaz Mas
0544c90984 Give markdown extension to README file 2017-08-20 19:01:28 +02:00
Robin Mills
989c5e7fe4 Merge pull request #29 from piponazo/travisSupport
Travis support
2017-08-20 17:53:17 +01:00
Luis Diaz Mas
37c1291671 Travis support for OSX 2017-08-20 18:08:59 +02:00
Luis Diaz Mas
c415e7f509 Fix CMake configuration when XMP is disabled. Check XMP variable instead LIBXMP 2017-08-20 16:54:49 +02:00
Luis Diaz Mas
1c9a8a18e4 Add travis support for Linux:
- Installing requirements with install script
- Add missing include(checkIncludeFile) cmake command
- Configuration matrix to compile the project with different options
2017-08-20 16:52:42 +02:00
clanmills
bfff891c4c MacOSX --with-adobe link issue. exiv2 now links correctly. Other samples remain broken. 2017-08-19 09:18:21 +01:00
Robin Mills
25a42e445a Build specification for v0.26.1 2017-08-18 14:58:01 +01:00
Robin Mills
afba52e042 Remove include tags_int.hpp from include/exiv2/*video.hpp files 2017-08-18 13:52:05 +01:00
Robin Mills
71cad2f9e0 Documentation update (cosmetic changes + Table of Contents) 2017-08-18 13:27:56 +01:00
Robin Mills
ffb36aee1e Merge pull request #28 from piponazo/moreCMakeCleanup
More cmake cleanup
2017-08-18 12:58:27 +01:00
Luis Diaz Mas
461a34d4e1 Remove old WORK_IN_PROGRESS file 2017-08-18 13:56:29 +02:00
Luis Diaz Mas
35c3e31958 Fixes for MSVC case 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
ca9ef34ea0 Add list of things to do in the future 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
6be5278dd2 Fix inclusion of file 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
27cde135d9 Remove more useless include_directories 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
93e603e031 Fix linking problems with pthreads 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
9808c3bf2d Simplify CMake code to identify FreeBSD systems 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
f5f5826c03 Use target_sources to extend the list of sources in exceptional situations 2017-08-18 13:55:45 +02:00
Luis Diaz Mas
45807ca03d Do not include SSH and CURL include dirs globally. Do it properly for the exiv2lib target 2017-08-18 13:55:45 +02:00