Merge branch 'release-0.1.8'

CMakeLists.txt

@@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LaTeX representation in the memory.")
 
 SET (MAJOR 0)
 SET (MINOR 1)
-SET (PATCH 7)
+SET (PATCH 8)
 
 LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)
 

cmake/backbone

@@ -1 +1 @@
-Subproject commit 1a86690f4b44f1c781da8fbb15723bf3089236e3
+Subproject commit 85724cbd4ef273ab6ce06507013dc5e6087023a6

cpack/CMakeLists.txt

@@ -6,5 +6,4 @@ SET (REDHAT_SECTION "Applications/Text")
 SET (LICENSE "LGPLv3+")
 SET (WIN32_UNINSTALL_NAME "LVLatStr") # <= 8 symbols for the name
 
-LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+INCLUDE (CPackCommonRules)
-INCLUDE (CPackCommon)

pkg-config/CMakeLists.txt

@@ -1,6 +1 @@
-INCLUDE (PkgConfigCommon)
+INCLUDE (PkgConfigCommonRules)
-
-CONFIGURE_FILE (
-  "${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc"
-)

pkg-config/pkg-config.pc.in

@@ -1,11 +0,0 @@
-prefix=@PkgConfigPrefix@
-exec_prefix=@PkgConfigExecPrefix@
-libdir=@PkgConfigLibDir@
-includedir=@PkgConfigIncludeDir@
-
-Name: @PkgConfigName@
-Description: @PkgConfigDescription@
-Version: @PkgConfigVersion@
-Libs: @PkgConfigLibs@
-Libs.private: @PkgConfigLibsPrivate@
-Cflags: @PkgConfigCflags@

po/CMakeLists.txt

@@ -1,41 +1 @@
-SET (GETTEXT_PACKAGE "${PROJECT_LOWERCASE_NAME_ABI}")
+INCLUDE (GettextCommonRules)
-ADD_DEFINITIONS (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
-
-IF (WIN32)
-  SET (LOCALEDIR "")
-ELSE ()
-  SET (LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
-ENDIF ()
-
-SET (CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")		
-
-IF (NOT CUSTOM_LOCALEDIR STREQUAL "")
-  SET (LOCALEDIR "${CUSTOM_LOCALEDIR}")
-  MESSAGE(STATUS "Using LOCALEDIR=${LOCALEDIR}")
-ENDIF ()
-
-ADD_DEFINITIONS (-DLOCALEDIR="${LOCALEDIR}")
-SET (LOCALE_INSTALL_DIR "share/locale")
-LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-INCLUDE (MacroOptionalAddSubdirectory)
-FIND_PACKAGE (Gettext REQUIRED)
-
-MACRO_OPTIONAL_ADD_SUBDIRECTORY (langs)
-
-# configure a header file for Gettext
-SET (VERSION ${MAJOR}.${MINOR}.${PATCH})
-SET (PROJECT_LOWERCASE_NAME_ABI "${PROJECT_LOWERCASE_NAME}-${MAJOR}")
-
-STRING (TOUPPER "${CMAKE_PROJECT_NAME}" GettextUniqueHeader)
-SET (GettextPackageNameAbi "${PROJECT_LOWERCASE_NAME_ABI}")
-CONFIGURE_FILE (
-  "gettext-config.h.in"
-  "${PROJECT_BINARY_DIR}/po/gettext-config.h"
-  )
-
-IF (NOT GETTEXT_MSGMERGE_EXECUTABLE)
-  MESSAGE (FATAL_ERROR "Please install msgmerge binary")
-ENDIF (NOT GETTEXT_MSGMERGE_EXECUTABLE)
-IF (NOT GETTEXT_MSGFMT_EXECUTABLE)
-  MESSAGE(FATAL_ERROR "Please install msgmerge binary")
-ENDIF (NOT GETTEXT_MSGFMT_EXECUTABLE)

po/gettext-config.h.in

@@ -1,11 +0,0 @@
-#ifndef @GettextUniqueHeader@_H
-#define @GettextUniqueHeader@_H
-
-#define GETTEXT_PACKAGE "@GettextPackageNameAbi@"
-#include <glib/gi18n-lib.h>
-
-#ifdef WIN32
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#endif
-
-#endif // @GettextUniqueHeader@_H

po/ru/CMakeLists.txt

@@ -1,2 +1 @@
-file(GLOB _po_files *.po)
+INCLUDE (GettextLangRules)
-GETTEXT_PROCESS_PO_FILES(ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )

src/CMakeLists.txt

@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/po)
-
 ADD_SUBDIRECTORY (latex-struct)