fix remaining lint warning

Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 2 years ago
parent 0f85d5a0e9
commit 75a732b470

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

@ -1,5 +1,4 @@
add_executable( set(APP_SOURCES
exiv2
exiv2.cpp exiv2.cpp
exiv2app.hpp exiv2app.hpp
actions.cpp actions.cpp
@ -10,6 +9,8 @@ add_executable(
app_utils.hpp app_utils.hpp
) )
add_executable(exiv2 ${APP_SOURCES})
target_include_directories(exiv2 PRIVATE ${PROJECT_SOURCE_DIR}/src) # To find i18n.hpp 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") 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) target_link_libraries(exiv2 PRIVATE std::filesystem)
if(MSVC OR MINGW) 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) add_library(wmain STATIC wmain.cpp)
target_link_libraries(exiv2 PRIVATE wmain) target_link_libraries(exiv2 PRIVATE wmain)
endif() endif()

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

@ -1,8 +1,6 @@
find_package(Gettext REQUIRED) find_package(Gettext REQUIRED)
gettext_create_translations( set(PO_SOURCES
exiv2.pot
ALL
bs.po bs.po
de.po de.po
ca.po ca.po
@ -22,6 +20,8 @@ gettext_create_translations(
vi.po vi.po
) )
gettext_create_translations(exiv2.pot ALL ${PO_SOURCES})
find_program(XGETTEXT xgettext) find_program(XGETTEXT xgettext)
add_custom_target( add_custom_target(

Loading…
Cancel
Save