fix remaining lint warning

Signed-off-by: Rosen Penev <rosenp@gmail.com>

CMakeLists.txt

@@ -162,14 +162,14 @@ endif()
 
 # Handle both relative and absolute paths (e.g. NixOS) for a relocatable package
 if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-  set(libdir_for_pc_file "${CMAKE_INSTALL_LIBDIR}")
+  set(EXIV2_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
 else()
-  join_paths(libdir_for_pc_file "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
+  join_paths(EXIV2_LIBDIR "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
 endif()
 if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-  set(includedir_for_pc_file "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(EXIV2_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
 else()
-  join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+  join_paths(EXIV2_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
 endif()
 configure_file(cmake/exiv2.pc.in exiv2.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

app/CMakeLists.txt

@@ -1,15 +1,16 @@
-add_executable(
+set(APP_SOURCES
-  exiv2
+    exiv2.cpp
-  exiv2.cpp
+    exiv2app.hpp
-  exiv2app.hpp
+    actions.cpp
-  actions.cpp
+    actions.hpp
-  actions.hpp
+    getopt.cpp
-  getopt.cpp
+    getopt.hpp
-  getopt.hpp
+    app_utils.cpp
-  app_utils.cpp
+    app_utils.hpp
-  app_utils.hpp
 )
 
+add_executable(exiv2 ${APP_SOURCES})
+
 target_include_directories(exiv2 PRIVATE ${PROJECT_SOURCE_DIR}/src) # To find i18n.hpp
 
 set_target_properties(exiv2 PROPERTIES COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS} XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
@@ -27,7 +28,9 @@ endif()
 target_link_libraries(exiv2 PRIVATE std::filesystem)
 
 if(MSVC OR MINGW)
-  # Trick to get properly UTF-8 encoded argv More info at: https://github.com/huangqinjin/wmain
+  # Trick to get properly UTF-8 encoded argv.
+
+  # More info at: https://github.com/huangqinjin/wmain
   add_library(wmain STATIC wmain.cpp)
   target_link_libraries(exiv2 PRIVATE wmain)
 endif()

cmake/exiv2.pc.in

@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=@libdir_for_pc_file@
+libdir=@EXIV2_LIBDIR@
-includedir=@includedir_for_pc_file@
+includedir=@EXIV2_INCLUDEDIR@
 
 Name: exiv2
 Description: @PROJECT_DESCRIPTION@

po/CMakeLists.txt

@@ -1,27 +1,27 @@
 find_package(Gettext REQUIRED)
 
-gettext_create_translations(
+set(PO_SOURCES
-  exiv2.pot
+    bs.po
-  ALL
+    de.po
-  bs.po
+    ca.po
-  de.po
+    es.po
-  ca.po
+    fi.po
-  es.po
+    fr.po
-  fi.po
+    gl.po
-  fr.po
+    ms.po
-  gl.po
+    nl.po
-  ms.po
+    pl.po
-  nl.po
+    pt.po
-  pl.po
+    ru.po
-  pt.po
+    sk.po
-  ru.po
+    sv.po
-  sk.po
+    ug.po
-  sv.po
+    uk.po
-  ug.po
+    vi.po
-  uk.po
-  vi.po
 )
 
+gettext_create_translations(exiv2.pot ALL ${PO_SOURCES})
+
 find_program(XGETTEXT xgettext)
 
 add_custom_target(