Cleanup some of the PACKAGE_XXX variables and rely in the ones given by the project() command

CMakeLists.txt

@@ -8,12 +8,7 @@ include(cmake/mainSetup.cmake  REQUIRED)
 
 set( PACKAGE_COPYRIGHT      "Andreas Huggel" )
 set( PACKAGE_BUGREPORT      "http://github.com/exiv2/exiv2" )
-set( PACKAGE                "exiv2" )
-set( PACKAGE_NAME           "exiv2" )
 set( PACKAGE_URL            "http://www.exiv2.org" )
-set( PACKAGE_STRING         "${PACKAGE_NAME} ${PROJECT_VERSION}" )
-set( GENERIC_LIB_VERSION    "26.0.0" )
-set( GENERIC_LIB_SOVERSION  "26" )
 
 # options and their default values
 option( BUILD_SHARED_LIBS             "Build exiv2lib as a shared library"                    ON  )

cmake/config.h.cmake

@@ -97,9 +97,6 @@
    slash. */
 #cmakedefine EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK
 
-/* Define to the name of this package. */
-#cmakedefine EXV_PACKAGE "@EXV_PACKAGE@"
-
 /* Define to the full name of this package. */
 #cmakedefine EXV_PACKAGE_NAME "@EXV_PACKAGE_NAME@"
 

cmake/generateConfigFile.cmake

@@ -10,9 +10,9 @@ set(EXV_ENABLE_WEBREADY  ${EXIV2_ENABLE_WEBREADY})
 set(EXV_HAVE_LENSDATA    ${EXIV2_ENABLE_LENSDATA})
 set(EXV_HAVE_PRINTUCS2   ${EXIV2_ENABLE_PRINTUCS2})
 
-set(EXV_PACKAGE          ${PACKAGE})
+set(EXV_PACKAGE_NAME     ${PROJECT_NAME})
 set(EXV_PACKAGE_VERSION  ${PROJECT_VERSION})
-set(EXV_PACKAGE_STRING   ${PACKAGE_STRING})
+set(EXV_PACKAGE_STRING   "${PROJECT_NAME} ${PROJECT_VERSION}")
 if (${EXIV2_ENABLE_XMP} OR ${EXIV2_ENABLE_EXTERNAL_XMP})
     set(EXV_HAVE_XMP_TOOLKIT ON)
 else()

po/CMakeLists.txt

@@ -24,15 +24,15 @@ add_translations(exiv2 ${PO_FILES})
 ##
 # execute xgettext on every file
 add_custom_target( pot-update
-    COMMAND xgettext -d ${PACKAGE_NAME}
+    COMMAND xgettext -d ${PROJECT_NAME}
     -s -D ${CMAKE_CURRENT_SOURCE_DIR}/..
-    -o ${PACKAGE_NAME}.pot
+    -o ${PROJECT_NAME}.pot
     -p ${CMAKE_CURRENT_SOURCE_DIR}/
     --from-code=UTF-8  --files-from=POTFILES.in
     -j
     --keyword=_
-    --package-name=${PACKAGE_NAME}
-    --package-version=${PACKAGE_VERSION}
+    --package-name=${PROJECT_NAME}
+    --package-version=${PROJECT_VERSION}
     --copyright-holder=${PACKAGE_COPYRIGHT}
     --msgid-bugs-address=${PACKAGE_BUGREPORT}
 )

src/CMakeLists.txt

@@ -186,8 +186,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
 endif()
 
 set_target_properties( exiv2lib PROPERTIES
-    VERSION       ${GENERIC_LIB_VERSION}
-    SOVERSION     ${GENERIC_LIB_SOVERSION}
+    VERSION       ${PROJECT_VERSION}
+    SOVERSION     ${PROJECT_VERSION_MAJOR}
     OUTPUT_NAME   exiv2
     COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
 )

src/exiv2.cpp

@@ -129,8 +129,8 @@ int main(int argc, char* const argv[])
 {
 #ifdef EXV_ENABLE_NLS
     setlocale(LC_ALL, "");
-    bindtextdomain(EXV_PACKAGE, EXV_LOCALEDIR);
-    textdomain(EXV_PACKAGE);
+    bindtextdomain(EXV_PACKAGE_NAME, EXV_LOCALEDIR);
+    textdomain(EXV_PACKAGE_NAME);
 #endif
 
     // Handle command line arguments

src/types.cpp

@@ -689,13 +689,13 @@ const char* _exvGettext(const char* str)
     static bool exvGettextInitialized = false;
 
     if (!exvGettextInitialized) {
-        bindtextdomain(EXV_PACKAGE, EXV_LOCALEDIR);
+        bindtextdomain(EXV_PACKAGE_NAME, EXV_LOCALEDIR);
 # ifdef EXV_HAVE_BIND_TEXTDOMAIN_CODESET
-        bind_textdomain_codeset (EXV_PACKAGE, "UTF-8");
+        bind_textdomain_codeset (EXV_PACKAGE_NAME, "UTF-8");
 # endif
         exvGettextInitialized = true;
     }
 
-    return dgettext(EXV_PACKAGE, str);
+    return dgettext(EXV_PACKAGE_NAME, str);
 }
 #endif // EXV_ENABLE_NLS