diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2011-02-07 19:20:53 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2011-02-07 19:20:53 +0100 |
| commit | ea6bae70e5b24a0496443aa857efafe83bbb3bc4 (patch) | |
| tree | cde8011990c39df41267dcd062f86a02f12be3dc | |
| parent | 97f7d2808fcc6c0e55bc3409cd8ac972f5d0cd70 (diff) | |
| download | logdiag-ea6bae70e5b24a0496443aa857efafe83bbb3bc4.tar.gz logdiag-ea6bae70e5b24a0496443aa857efafe83bbb3bc4.tar.xz logdiag-ea6bae70e5b24a0496443aa857efafe83bbb3bc4.zip | |
Normalize CMakeLists.txt.
Use the full version number in package names.
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb9e30d..33f91ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ if (GETTEXT_FOUND) set (HAVE_GETTEXT true) file (GLOB project_TRANSLATIONS ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po) GETTEXT_CREATE_TRANSLATIONS ( - ${CMAKE_CURRENT_SOURCE_DIR}/po/${PROJECT_NAME}.pot + ${CMAKE_CURRENT_SOURCE_DIR}/po/${CMAKE_PROJECT_NAME}.pot ALL ${project_TRANSLATIONS}) endif (GETTEXT_FOUND) @@ -296,10 +296,11 @@ if (WIN32) else (WIN32) set (CPACK_GENERATOR "TGZ;ZIP") endif (WIN32) + set (CPACK_PACKAGE_FILE_NAME - "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + "${CMAKE_PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") set (CPACK_PACKAGE_INSTALL_DIRECTORY - "${PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") + "${CMAKE_PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set (CPACK_NSIS_INSTALLED_ICON_NAME "logdiag.exe") set (CPACK_NSIS_CREATE_ICONS_EXTRA @@ -308,8 +309,10 @@ set (CPACK_NSIS_DELETE_ICONS_EXTRA "!insertmacro MUI_STARTMENU_GETFOLDER Application $SM_FOLDER Delete '\$SMPROGRAMS\\\\$SM_FOLDER\\\\logdiag.lnk'") -set (CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk2.0-0 (>= 2.12), libjson-glib-1.0-0 (>= 0.10.4), liblua5.1-0, librsvg2-common") -set (CPACK_DEBIAN_PACKAGE_BUILDS_DEPENDS "libgtk2.0-dev (>= 2.12), libjson-glib-dev (>= 0.10.4), liblua5.1-0-dev") +set (CPACK_DEBIAN_PACKAGE_DEPENDS + "libgtk2.0-0 (>= 2.12), libjson-glib-1.0-0 (>= 0.10.4), liblua5.1-0, librsvg2-common") +set (CPACK_DEBIAN_PACKAGE_BUILDS_DEPENDS + "libgtk2.0-dev (>= 2.12), libjson-glib-dev (>= 0.10.4), liblua5.1-0-dev") set (CPACK_DEBIAN_PACKAGE_SECTION "Electronics") set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${project_URL}") @@ -320,8 +323,7 @@ set (CPACK_RPM_PACKAGE_URL "${project_URL}") set (CPACK_SOURCE_GENERATOR "TGZ;ZIP") set (CPACK_SOURCE_IGNORE_FILES "/.git;/build;/win32-depends;/liblogdiag/ld-marshal.[ch]") -set (CPACK_SOURCE_PACKAGE_FILE_NAME - "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") +set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${project_VERSION}") include (CPack) |