Robin Mills
b5cac373b1
Merge pull request #39 from Exiv2/autotoolsMacLink
...
./configure --with-adobe[=2016|2014|2013] for MacOSX
2017-08-23 08:04:48 +01:00
Andreas Sturmlechner
a768b85191
Lowercase target_link_libraries
2017-08-22 18:21:28 +02:00
Andreas Sturmlechner
20c7ad6c59
Lowercase include{,_directories}
2017-08-22 18:21:28 +02:00
Andreas Sturmlechner
1fc319c0e4
Lowercase add_custom_target, configure_file, install macros
2017-08-22 18:21:28 +02:00
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
clanmills
573b2cfcd2
XMPsdk fixes. 2013 and 2016 build and (mostly) pass the test suite.
2017-08-22 14:34:01 +01: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
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 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
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
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
Andreas Sturmlechner
aa6374b202
Use more GNUInstallDirs
...
Conveniently fixes multiarch install dir issues.
2017-08-21 00:12:33 +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
Robin Mills
afba52e042
Remove include tags_int.hpp from include/exiv2/*video.hpp files
2017-08-18 13:52:05 +01:00
Luis Diaz Mas
35c3e31958
Fixes for MSVC case
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
Luis Diaz Mas
c50702612d
Simplify CMake code for handling SSH and CURL cases
2017-08-18 13:55:45 +02:00
Luis Díaz Más
57cd78b517
Put all the CMake related with the exiv app together
2017-08-18 13:55:45 +02:00
Luis Díaz Más
ee61c24459
Remove inclusion of many useless include_directories
2017-08-18 13:55:45 +02:00
Luis Díaz Más
1c03767391
Move inclusion of private header from .hpp to .cpp (not needed in the .hpp)
2017-08-18 13:55:45 +02:00
Luis Díaz Más
73f53cc6f9
Move sample applications from src/CMakeLists.txt to samples/CMakeLists.txt
2017-08-18 13:55:44 +02:00
Robin Mills
aefa3e3d34
MacOSX --with-adobe link issue. Work in progress. Code and documentation update.
2017-08-18 08:19:07 +01:00
Robin Mills
2a61392766
Merge pull request #27 from piponazo/master-CMakeObjectLibraryForXmp
...
New way to generate the XMP library (Using the CMake OBJECT LIBRARY concept)
2017-08-16 17:42:08 +01:00
Luis Diaz Mas
b387d58507
Remove EXPAT_LIBRARIES from where it is not needed (already inherited from exiv2lib target)
2017-08-16 17:53:21 +02:00
Luis Diaz Mas
40d10639e2
Reuse XMP OBJECT library in the exiv2lib when EXIV2_ENABLE_LIBXMP=OFF
2017-08-16 17:49:09 +02:00
clanmills
935421c855
Refactoring autotools to support ADOBE_XMPSDK (Work in Progress)
2017-08-15 20:00:09 +01:00
Luis Diaz Mas
64bbe802e2
Install exv_conf.h properly
2017-08-14 08:28:55 +02:00
Luis Diaz Mas
b4a2b822c2
Remove usage of global variable INSTALL_TARGET_STANDARD_ARGS. Specify install destinitions in each target
2017-08-14 08:28:24 +02:00
clanmills
2e816165ea
Changes to autotools to support C++11 (work in progress)
2017-08-12 14:48:38 +01:00
Luis Díaz Más
b6885c8028
Since we are requiring CMake 3.1 we can remove the usage of PRIVATE_VAR and use directly PRIVATE or PUBLIC
2017-08-10 19:39:07 +02:00
clanmills
e2862ba764
#1300 and #1301 (583cfd6e and 3bbba3f8). These fixes were accidentally lost on 2017-08-07.
2017-08-10 00:01:08 +01:00
clanmills
1505b4c3aa
#11 Integrating fix into master (accidentally lost on 2017-08-07 by rebase -force)
2017-08-09 23:51:03 +01:00
clanmills
122cd5737f
Cosmetic modifications to Pull-21. Fix to ensure Cygwin uses #include <unistd.h>
2017-08-09 23:41:42 +01:00
Robin Mills
8592c10a3e
Merge pull request #21 from piponazo/configFileFromCMake
...
New way to generate the include/exiv2/exv_conf.h file
2017-08-09 22:26:05 +01:00
Luis Díaz Más
e474b0fbd3
localtime.c and getopt_win32.c added unconditionally for the exiv2 app
2017-08-09 23:03:52 +02:00
clanmills
011f2b5259
Fixing bug in test harness on Linux.
2017-08-09 12:55:04 +01:00
Luis Diaz Mas
22efdffd1d
Use #ifdef instead of #if for EXV_HAVE_REGEX
2017-08-08 22:15:17 +02:00
Luis Diaz Mas
252d738b6c
Include xmpsdk/include only in the needed target. Remove other uneeded usages of INCLUDE_DIRECTORIES and LINK_DIRECTORIES
2017-08-08 21:58:45 +02:00
Luis Diaz Mas
1d327fba21
Correct usage of HAVE_REGEX
2017-08-08 21:58:45 +02:00
Luis Diaz Mas
911832d70a
Handle HAVE_TIMEGM variable in the new cmake file
2017-08-08 21:58:45 +02:00
