[libjxl] Remove libm dependency when building with MSVC

[ayeteadoe]

This patches MSVC builds to not link with libm. Otherwise, when NOT BUILD_SHARED_LIBS is true, targets that depend on the libjxl target try to link with m.lib.

The following was the previous workaround I had to do before this fix:

diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt
index 794271d014..2c55c49dfd 100644
--- a/Libraries/LibGfx/CMakeLists.txt
+++ b/Libraries/LibGfx/CMakeLists.txt
@@ -137,6 +137,11 @@ endif()
 
 if (NOT ANDROID)
     pkg_check_modules(Jxl REQUIRED IMPORTED_TARGET libjxl)
+    if (MSVC)
+        get_target_property(LIBJXL_INTERFACE_LINK_LIBS PkgConfig::Jxl INTERFACE_LINK_LIBRARIES)
+        list(REMOVE_ITEM LIBJXL_INTERFACE_LINK_LIBS "m")
+        set_target_properties(PkgConfig::Jxl PROPERTIES INTERFACE_LINK_LIBRARIES "${LIBJXL_INTERFACE_LINK_LIBS}")
+    endif()
     target_link_libraries(LibGfx PRIVATE PkgConfig::Jxl)
 else()
     find_package(libjxl REQUIRED)

• Changes comply with the maintainer guide.
• SHA512s are updated for each updated download.
• The "supports" clause reflects platforms that may be fixed by this new version.
• Any fixed CI baseline entries are removed from that file.
• Any patches that are no longer applied are deleted from the port's directory.
• The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
• Only one version is added to each modified port's versions file.

[ayeteadoe]

Is it possible to add a test for this?

[ayeteadoe]

@microsoft-github-policy-service agree

[BillyONeal]

The build failures appear legitimate. Perhaps the tools feature should be "supports": "native" or "supports": "!uwp"

[BillyONeal]

Thanks for the fix!

[BillyONeal]

Can you submit this patch to https://github.com/libjxl/libjxl/pulls ?

[dg0yt]

IMO the change is incorrect: JPEGXL_REQUIRES_TYPE should be set regardless of MSVC.

[ayeteadoe]

libjxl/libjxl#4314

[BillyONeal]

IMO the change is incorrect: JPEGXL_REQUIRES_TYPE should be set regardless of MSVC.

Sigh; you're right and I missed this :/

[BillyONeal]

#46240

[dc6c]

Unfortunately, this also needs to patch up lib/jxl_cms.cmake and lib/threads/libjxl_threads.pc.in, or otherwise the linking against libm sneaks in via those routes.