third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle all the PACKAGE_XXX variables in the new cmake file

Browse Source
This commit is contained in:
Luis Diaz Mas 2017-07-30 20:07:51 +02:00
parent 1bf5e177a1
commit 09fc98eebf
6 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -30,10 +30,9 @@ SET( PACKAGE_COPYRIGHT "Andreas Huggel" )
SET( PACKAGE_BUGREPORT "http://github.com/exiv2/exiv2" )
SET( PACKAGE "exiv2" )
SET( PACKAGE_NAME "exiv2" )
SET( PACKAGE_STRING "exiv2 0.26" )
SET( PACKAGE_TARNAME "exiv2" )
SET( PACKAGE_VERSION "0.26" )
SET( PACKAGE_URL "http://www.exiv2.org" )
SET( PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}" )
SET( GENERIC_LIB_VERSION "26.0.0" )
SET( GENERIC_LIB_SOVERSION "26" )

6
config/CMakeChecks.txt
View File

@ -190,12 +190,6 @@ SET( EXV_SYMBOLS ENABLE_WEBREADY
HAVE__BOOL
HAVE_REGEX
UNICODE_PATH
PACKAGE
PACKAGE_BUGREPORT
PACKAGE_NAME
PACKAGE_STRING
PACKAGE_TARNAME
PACKAGE_VERSION
STRERROR_R_CHAR_P
)

12
config/config.h.cmake
View File

@ -154,20 +154,14 @@
slash. */
#cmakedefine EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK 1
/* Define to the address where bug reports for this package should be sent. */
#cmakedefine EXV_PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
/* Define to the name of this package. */
#cmakedefine EXV_PACKAGE "@PACKAGE@"
#cmakedefine EXV_PACKAGE "@EXV_PACKAGE@"
/* Define to the full name of this package. */
#cmakedefine EXV_PACKAGE_NAME "@PACKAGE_NAME@"
#cmakedefine EXV_PACKAGE_NAME "@EXV_PACKAGE_NAME@"
/* Define to the full name and version of this package. */
#cmakedefine EXV_PACKAGE_STRING "@PACKAGE_STRING@"
/* Define to the one symbol short name of this package. */
#cmakedefine EXV_PACKAGE_TARNAME "@PACKAGE_TARNAME@"
#cmakedefine EXV_PACKAGE_STRING "@EXV_PACKAGE_STRING@"
/* Define to the version of this package. */
#cmakedefine EXV_PACKAGE_VERSION "@PACKAGE_VERSION@"

4
config/generateConfigFile.cmake
View File

@ -4,6 +4,10 @@ if (${EXIV2_ENABLE_WEBREADY})
set(EXV_USE_CURL ${EXIV2_ENABLE_CURL})
endif()
set(EXV_ENABLE_VIDEO ${EXIV2_ENABLE_VIDEO})
set(EXV_PACKAGE ${PACKAGE})
set(EXV_PACKAGE_VERSION ${PACKAGE_VERSION})
set(EXV_PACKAGE_STRING ${PACKAGE_STRING})
set(EXV_HAVE_XMP_TOOLKIT ${HAVE_XMP_TOOLKIT})
# TODO: Try to use the cmake function check_symbol_exists which is more robust
check_function_exists( gmtime_r EXV_HAVE_GMTIME_R )

9
include/exiv2/exv_msvc-webready.h
View File

@ -18,18 +18,9 @@
/* Define to 1 if you have the <process.h> header file. */
#define EXV_HAVE_PROCESS_H 1
/* Define to the address where bug reports for this package should be sent. */
#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
/* Define to the full name of this package. */
#define EXV_PACKAGE_NAME "exiv2"
/* Define to the full name and version of this package. */
#define EXV_PACKAGE_STRING "exiv2 0.26"
/* Define to the one symbol short name of this package. */
#define EXV_PACKAGE_TARNAME "exiv2"
/* Define to the version of this package. */
#define EXV_PACKAGE_VERSION "0.26"

9
include/exiv2/exv_msvc.h
View File

@ -158,21 +158,12 @@
slash. */
/* #undef EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK */
/* Define to the address where bug reports for this package should be sent. */
#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
/* Define to the name of this package. */
#define EXV_PACKAGE "exiv2"
/* Define to the full name of this package. */
#define EXV_PACKAGE_NAME "exiv2"
/* Define to the full name and version of this package. */
#define EXV_PACKAGE_STRING "exiv2 0.26"
/* Define to the one symbol short name of this package. */
#define EXV_PACKAGE_TARNAME "exiv2"
/* Define to the version of this package. */
#define EXV_PACKAGE_VERSION "0.26"