diff --git a/CMakeLists.txt b/CMakeLists.txt index 536c3d2f..596a4d8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required( VERSION 3.3.2 ) -project( exiv2 ) +project( exiv2 + VERSION 0.27.0 + LANGUAGES CXX C +) include(cmake/mainSetup.cmake REQUIRED) @@ -7,9 +10,8 @@ set( PACKAGE_COPYRIGHT "Andreas Huggel" ) set( PACKAGE_BUGREPORT "http://github.com/exiv2/exiv2" ) set( PACKAGE "exiv2" ) set( PACKAGE_NAME "exiv2" ) -set( PACKAGE_VERSION "0.26" ) set( PACKAGE_URL "http://www.exiv2.org" ) -set( PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}" ) +set( PACKAGE_STRING "${PACKAGE_NAME} ${PROJECT_VERSION}" ) set( GENERIC_LIB_VERSION "26.0.0" ) set( GENERIC_LIB_SOVERSION "26" ) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 941bf651..ce671883 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -107,7 +107,7 @@ #cmakedefine EXV_PACKAGE_STRING "@EXV_PACKAGE_STRING@" /* Define to the version of this package. */ -#cmakedefine EXV_PACKAGE_VERSION "@PACKAGE_VERSION@" +#cmakedefine EXV_PACKAGE_VERSION "@PROJECT_VERSION@" /* Define to empty if `const' does not conform to ANSI C. */ #cmakedefine const diff --git a/cmake/generateConfigFile.cmake b/cmake/generateConfigFile.cmake index 34b88223..9386f7c3 100644 --- a/cmake/generateConfigFile.cmake +++ b/cmake/generateConfigFile.cmake @@ -11,7 +11,7 @@ set(EXV_HAVE_LENSDATA ${EXIV2_ENABLE_LENSDATA}) set(EXV_HAVE_PRINTUCS2 ${EXIV2_ENABLE_PRINTUCS2}) set(EXV_PACKAGE ${PACKAGE}) -set(EXV_PACKAGE_VERSION ${PACKAGE_VERSION}) +set(EXV_PACKAGE_VERSION ${PROJECT_VERSION}) set(EXV_PACKAGE_STRING ${PACKAGE_STRING}) if (${EXIV2_ENABLE_XMP} OR ${EXIV2_ENABLE_EXTERNAL_XMP}) set(EXV_HAVE_XMP_TOOLKIT ON) diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake index 4056ab83..bc568a59 100644 --- a/cmake/printSummary.cmake +++ b/cmake/printSummary.cmake @@ -35,7 +35,6 @@ message( STATUS "" ) message( STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}") message( STATUS "------------------------------------------------------------------" ) -message( STATUS "${PACKAGE_STRING} configure results <${PACKAGE_URL}>" ) OptionOutput( "Building shared library: " BUILD_SHARED_LIBS ) OptionOutput( "Building PNG support: " EXIV2_ENABLE_PNG AND ZLIB_FOUND ) if ( EXIV2_ENABLE_EXTERNAL_XMP )