CMake: Fix uninitialized variables

This fixes some actual bugs for PROJECT and BZIP2_INCLUDE_DIR.

Gbp-Dch: ignore

diff --git a/CMake/Documentation.cmake b/CMake/Documentation.cmake
index 9e7135ea4a7c1568f1178aca7bfda45c6067c305..f679b82e17a9a3635ae1150257b5ac57c474ec06 100644 (file)
--- 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
         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}
                      --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_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}
 
         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)
 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})
 
     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 3562172bd3a2010d2062b467cac44d37ed8df3be..79f2633a79534ef001484dd5ba3b8c9a96e8d55f 100644 (file)
--- 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(abs_files "")
     set(scripts "")
     set(abs_scripts "")

+    set(mofiles)

     set(targets ${NLS_TARGETS})
     set(domain ${NLS_DOMAIN})
     set(xgettext_params
     set(targets ${NLS_TARGETS})
     set(domain ${NLS_DOMAIN})
     set(xgettext_params

diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt
index ec78f49c404f05d232cb11eef33a57760c31d4e2..a90bb1d8c4071226ea1e54a09bedd6686ca51fb9 100644 (file)
--- 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}
 # 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
                                    ${LZMA_INCLUDE_DIRS}
                                    ${LZ4_INCLUDE_DIRS})
 target_link_libraries(apt-pkg