Browse Source

cmake/backbone submodule updated.

tags/v0.1.9
Kolan Sh 4 years ago
parent
commit
9f72fe6feb
10 changed files with 6 additions and 74 deletions
  1. +1
    -1
      cmake/backbone
  2. +1
    -2
      cpack/CMakeLists.txt
  3. +2
    -2
      pkg-config/CMakeLists.txt
  4. +0
    -11
      pkg-config/pkg-config.pc.in
  5. +1
    -41
      po/CMakeLists.txt
  6. +0
    -11
      po/gettext-config.h.in
  7. +0
    -2
      po/langs/CMakeLists.txt
  8. +0
    -2
      po/langs/ru/CMakeLists.txt
  9. +1
    -0
      po/ru/CMakeLists.txt
  10. +0
    -2
      src/CMakeLists.txt

+ 1
- 1
cmake/backbone

@@ -1 +1 @@
Subproject commit 1a86690f4b44f1c781da8fbb15723bf3089236e3
Subproject commit df96ceb0b067844d341f0405db7c10def84d772c

+ 1
- 2
cpack/CMakeLists.txt View File

@@ -6,5 +6,4 @@ SET (REDHAT_SECTION "Development/Libraries")
SET (LICENSE "LGPLv3+")
SET (WIN32_UNINSTALL_NAME "GobjPlug") # <= 8 symbols for the name

LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
INCLUDE (CPackCommon)
INCLUDE (CPackCommonRules)

+ 2
- 2
pkg-config/CMakeLists.txt View File

@@ -1,4 +1,4 @@
INCLUDE (PkgConfigCommon)
INCLUDE (PkgConfigCommonRules)

SET (PkgConfigLibs "-L\${libdir}")
IF (WIN32)
@@ -12,6 +12,6 @@ ELSE (WIN32)
ENDIF (WIN32)

CONFIGURE_FILE (
"${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.in"
"${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc"
)

+ 0
- 11
pkg-config/pkg-config.pc.in View File

@@ -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@

+ 1
- 41
po/CMakeLists.txt View File

@@ -1,41 +1 @@
SET (GETTEXT_PACKAGE "${PROJECT_LOWERCASE_NAME_ABI}")
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)
INCLUDE (GettextCommonRules)

+ 0
- 11
po/gettext-config.h.in View File

@@ -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

+ 0
- 2
po/langs/CMakeLists.txt View File

@@ -1,2 +0,0 @@
ADD_SUBDIRECTORY (ru)
# ADD_SUBDIRECTORY (de)

+ 0
- 2
po/langs/ru/CMakeLists.txt View File

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

+ 1
- 0
po/ru/CMakeLists.txt View File

@@ -0,0 +1 @@
INCLUDE (GettextLangRules)

+ 0
- 2
src/CMakeLists.txt View File

@@ -1,5 +1,3 @@
INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/po)

ADD_SUBDIRECTORY (host-iface)
ADD_SUBDIRECTORY (plugin-iface)
ADD_SUBDIRECTORY (loader)

Loading…
Cancel
Save