meson changes

[neheb]

No description provided.

[ghost]

👇 Click on the image for a new way to code review

Legend

[neheb]

@eli-schwartz iconv change sensible?

[codecov]

Codecov Report

Merging #2712 (51e76cb) into main (6ea6e2c) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #2712   +/-   ##
=======================================
  Coverage   63.91%   63.91%           
=======================================
  Files         103      103           
  Lines       22312    22312           
  Branches    10805    10805           
=======================================
  Hits        14260    14260           
  Misses       5830     5830           
  Partials     2222     2222           

Files Changed	Coverage Δ
src/convert.cpp	52.35% <100.00%> (ø)

[neheb]

@Ryanf55 can you test the cmake changes?

[neheb]

@kmilos plz approve this PR as it contains a fix for meson CI build failures.

[Ryanf55]

yeah, #2703 broke it.

@Ryanf55 plz fix.

Let's follow up in the original PR?

[neheb]

sure

[Ryanf55]

Yes. I added CMake config support to meson

Ok, so should I try to build/install with meson, then check I can still consume exiv2 with CMake?

Results not successful, the meson install seems to be missing the exiv2Export.cmake file.

@Ryanf55 can you test the cmake changes?

meson setup meson_build
cd meson_build
meson compile
meson install --destdir mesoninstall

Then, a simple test project that tries to find it in CONFIG mode.

ryan@ryan-B650-970:~/Development/ryanf55/exiv2/test_build$ cmake -S . -B build -DCMAKE_PREFIX_PATH=../meson_build/mesoninstall/usr/local/lib/x86_64-linux-gnu/cmake/
-- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.13")  
CMake Error at /home/ryan/Development/ryanf55/exiv2/meson_build/mesoninstall/usr/local/lib/x86_64-linux-gnu/cmake/exiv2/exiv2Config.cmake:25 (include):
  include could not find requested file:

    /home/ryan/Development/ryanf55/exiv2/meson_build/mesoninstall/usr/local/lib/x86_64-linux-gnu/cmake/exiv2/exiv2Export.cmake
Call Stack (most recent call first):
  CMakeLists.txt:4 (find_package)


CMake Error at /home/ryan/Development/ryanf55/exiv2/meson_build/mesoninstall/usr/local/lib/x86_64-linux-gnu/cmake/exiv2/exiv2Config.cmake:27 (check_required_components):
  Unknown CMake command "check_required_components".
Call Stack (most recent call first):
  CMakeLists.txt:4 (find_package)


-- Configuring incomplete, errors occurred!

Although ZLIB is found, the export file is not found.

The generated config file is looking for the export file named like so.
include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")

Just a note: The cmake generated config file looks like this:

####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was exiv2Config.cmake.in                            ########

get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)

macro(set_and_check _var _file)
  set(${_var} "${_file}")
  if(NOT EXISTS "${_file}")
    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
  endif()
endmacro()

macro(check_required_components _NAME)
  foreach(comp ${${_NAME}_FIND_COMPONENTS})
    if(NOT ${_NAME}_${comp}_FOUND)
      if(${_NAME}_FIND_REQUIRED_${comp})
        set(${_NAME}_FOUND FALSE)
      endif()
    endif()
  endforeach()
endmacro()

####################################################################################

cmake_minimum_required(VERSION 3.5)
include(CMakeFindDependencyMacro)

if(ON) # if(EXIV2_ENABLE_PNG)
  find_dependency(ZLIB REQUIRED)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")

check_required_components(exiv2)

While the meson one looks different, because it is missing the definition of check_required_components.

####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was exiv2Config.cmake.in ########

get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../.." ABSOLUTE)

macro(set_and_check _var _file)
  set(${_var} "${_file}")
  if(NOT EXISTS "${_file}")
    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
  endif()
endmacro()

####################################################################################


cmake_minimum_required(VERSION 3.5)
include(CMakeFindDependencyMacro)

if(ON) # if(EXIV2_ENABLE_PNG)
  find_dependency(ZLIB REQUIRED)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")

check_required_components(exiv2)

[neheb]

hrm I'll remove it then.

[Ryanf55]

Seems like this PR is missing the other macro, check_required_components: mesonbuild/meson#5949

Even if that's fixed, there doesn't seem to be a way to get meson to generate the export set.

Edit: There's a draft PR to do exports, but it's not merged: mesonbuild/meson#9978

[neheb]

alright, removed. just kept the version file, which does I have no idea what.

[neheb]

@kmilos please review. Note I got rid of one CI here.

[kmilos]

LGTM

[1div0]

LG2M++