diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-20 14:41:33 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-20 14:41:33 +0200 |
| commit | ee60e00ccc68104cae56a854ffd2fb65a959ce57 (patch) | |
| tree | ae933525cc74d791116f55309f0419620ab84f96 | |
| parent | c43a7ed46ce5fb88235c954dc210dd02a5e6e377 (diff) | |
CMake: Fix uninitialized variables
This fixes some actual bugs for PROJECT and BZIP2_INCLUDE_DIR.
Gbp-Dch: ignore
| -rw-r--r-- | CMake/Documentation.cmake | 4 | ||||
| -rw-r--r-- | CMake/Translations.cmake | 1 | ||||
| -rw-r--r-- | apt-pkg/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMake/Documentation.cmake b/CMake/Documentation.cmake index 9e7135ea4..f679b82e1 100644 --- a/CMake/Documentation.cmake +++ b/CMake/Documentation.cmake @@ -75,7 +75,7 @@ function(po4a_one stamp_out out full_document language deps) OUTPUT ${stamp} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${language} COMMAND po4a --previous --no-backups - --package-name='${PROJECT}-doc' + --package-name='${PROJECT_NAME}-doc' --package-version='${PACKAGE_VERSION}' --msgid-bugs-address='${PACKAGE_MAIL}' --translate-only ${dest}.${ext} @@ -124,6 +124,7 @@ function(xsltproc_one) set(manpage_output "${CMAKE_CURRENT_BINARY_DIR}/${document}.${section}") endif() set(manpage_stylesheet "${CMAKE_CURRENT_SOURCE_DIR}/manpage-style.xsl") + set(manpage_params) install(FILES ${manpage_output} DESTINATION ${CMAKE_INSTALL_MANDIR}/${language}/man${section} @@ -221,6 +222,7 @@ endfunction() function(add_docbook target) set(generated "") set(options HTML TEXT MANPAGE ALL) + set(oneValueArgs) set(multiValueArgs INSTALL DOCUMENTS LINGUAS DEPENDS) cmake_parse_arguments(DOC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake index 3562172bd..79f2633a7 100644 --- a/CMake/Translations.cmake +++ b/CMake/Translations.cmake @@ -11,6 +11,7 @@ function(apt_add_translation_domain) set(abs_files "") set(scripts "") set(abs_scripts "") + set(mofiles) set(targets ${NLS_TARGETS}) set(domain ${NLS_DOMAIN}) set(xgettext_params diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt index ec78f49c4..a90bb1d8c 100644 --- a/apt-pkg/CMakeLists.txt +++ b/apt-pkg/CMakeLists.txt @@ -26,7 +26,7 @@ add_dependencies(apt-pkg apt-pkg-versionscript) # Link the library and set the SONAME target_include_directories(apt-pkg PRIVATE ${ZLIB_INCLUDE_DIRS} - ${BZIP2_INCLUDE_DIRS} + ${BZIP2_INCLUDE_DIR} ${LZMA_INCLUDE_DIRS} ${LZ4_INCLUDE_DIRS}) target_link_libraries(apt-pkg |