[VTK] VTK ExprTk cmake patch #29801

ArashPartow · 2023-02-23T06:38:56Z

This patch is intended to unblock the following PR: #29665

and is based on this VTK MR: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981

ArashPartow · 2023-02-23T06:40:39Z

@ LilyWangLL / @JonLiu1993 / @FrankXie05 when you have a moment can you please review and merge this PR.

dg0yt · 2023-02-23T06:48:12Z

Past PRs: #29775, #29665.
It is probably easier if you don't re-start a new PR after each change. Just add new commits with the requested changes.

ArashPartow · 2023-02-23T07:03:53Z

@dg0yt The PR #29665 is awaiting this PR to be merged - it has to remain a seperate PR as it is for another project.

ArashPartow · 2023-02-23T21:31:09Z

@JavierMatosD Looks like "microsoft.vcpkg.pr (x86_windows) " needs to be rerun, I don't have perms to rerun that part, can you please trigger it.

 C:\a\1\s\scripts\bootstrap.ps1 : Downloading vcpkg.exe failed. Please check your internet connection, or consider
 downloading a recent vcpkg.exe from ***-tool with a browser.
 At line:1 char:4
 + & {& 'C:\a\1\s\scripts\bootstrap.ps1' }
 +    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     + CategoryInfo          : NotSpecified: (:) [Write-Error], WriteErrorException
     + FullyQualifiedErrorId : Microsoft.PowerShell.Commands.WriteErrorException,bootstrap.ps1
 
 ScriptHalted
 At C:\a\1\s\scripts\bootstrap.ps1:60 char:5
 +     throw
 +     ~~~~~
     + CategoryInfo          : OperationStopped: (:) [], RuntimeException
     + FullyQualifiedErrorId : ScriptHalte
.
.
.
"C:\Program Files\PowerShell\7\pwsh.exe" -NoLogo -NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command ". 'C:\a\_temp\752f9bab-25b9-4eb4-b2a4-c5176e8b748b.ps1'"
./vcpkg.exe : The term './vcpkg.exe' is not recognized as a name of a cmdlet, function, script file, or executable program.
Check the spelling of the name, or if a path was included, verify that the path is correct and try again.
At C:\a\1\s\scripts\azure-pipelines\windows\validate-version-files.ps1:1 char:1
+ ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose |
+ ~~~~~~~~~~~
+ CategoryInfo          : ObjectNotFound: (./vcpkg.exe:String) [], ParentContainsErrorRecordException
+ FullyQualifiedErrorId : CommandNotFoundException
##[error]PowerShell exited with code '1'.

ArashPartow · 2023-02-24T19:41:39Z

@JonLiu1993 / @ LilyWangLL / @FrankXie05 if there's nothing else can this be merged as the following PR depends on this being merged first: #29665

JavierMatosD · 2023-02-24T19:53:43Z

ports/vtk/FindExprTk.patch

+-#   find_package(ExprTk 2.71828)
+-# to require version 2.71828 or newer of ExprTk.
+#   find_package(ExprTk 2.7)
+# to require version 2.7 or newer of ExprTk.
+ #


This find_package call needs to be patched out to remove the version constraint entirely.

That is a comment in the CMake.

JavierMatosD · 2023-02-24T19:58:57Z

ports/vtk/FindExprTk.patch

+  file(STRINGS "${ExprTk_INCLUDE_DIR}/exprtk.hpp" _exprtk_version_header REGEX "\"[0-9.]+\"")
+  set(ExprTk_VERSION)
+  foreach (_exprtk_version_line IN LISTS _exprtk_version_header)
+    if ("${ExprTk_VERSION}" STREQUAL "")
+      string(REGEX MATCH "version = \"(2\.7[0-9.]+)\".*$" _exprtk_version_match "${_exprtk_version_line}")
+      set(ExprTk_VERSION "${CMAKE_MATCH_1}")
+    else ()
+      string(REGEX MATCH "\"([0-9.]+)\".*$" _exprtk_version_match "${_exprtk_version_line}")
+      set(ExprTk_VERSION "${ExprTk_VERSION}${CMAKE_MATCH_1}")
+    endif ()
+    if (_exprtk_version_match MATCHES "\;")
+      break()
+    endif ()
+  endforeach ()
+  if (NOT ExprTk_VERSION)
+    # fallback: version in exprtk.hpp has always started with 2.7
+    set(ExprTk_VERSION "2.7")
+  endif ()


Is there a reason we need to know the version? I believe this should be patched out to remove any version constraints.

@JavierMatosD I'm not sure about the answer to that as I am not familiar with the VTK build setup. For more details there is a discussion here: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981

My objective is to get this PR merged to unblock the following PR: #29665 that has been around for some time now. As there are several projects I know of that use ExprTk via vcpkg and do not require/depend on VTK that are waiting on the version bump.

@JavierMatosD in short I'm happy for you to improve this particular cmake as a separate PR. Even better yet if you have any ideas on how to remove the dependency on this PR https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9981 requiring VTK to build as that would make life much easier for all invovled.

@LilyWangLL / @JonLiu1993 / @FrankXie05 / @MonicaLiu0311 / @BillyONeal If there is nothing else that needs doing can we please merge this PR.

VTK ExprTk cmake patch

b160966

FrankXie05 assigned JonLiu1993 Feb 23, 2023

JonLiu1993 changed the title ~~VTK ExprTk cmake patch~~ [exprtk] VTK ExprTk cmake patch Feb 23, 2023

JonLiu1993 changed the title ~~[exprtk] VTK ExprTk cmake patch~~ [VTK] VTK ExprTk cmake patch Feb 23, 2023

JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Feb 23, 2023

JonLiu1993 approved these changes Feb 23, 2023

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 23, 2023

Merge branch 'microsoft:master' into master

92cb72c

JavierMatosD added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Feb 23, 2023

ArashPartow requested a review from JonLiu1993 February 24, 2023 00:09

JonLiu1993 approved these changes Feb 24, 2023

View reviewed changes

JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Feb 24, 2023

JavierMatosD requested changes Feb 24, 2023

View reviewed changes

JavierMatosD added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Feb 24, 2023

ArashPartow requested a review from JonLiu1993 February 25, 2023 19:44

ArashPartow closed this Feb 26, 2023

ArashPartow reopened this Feb 26, 2023

ArashPartow closed this by deleting the head repository Mar 1, 2023

ArashPartow reopened this Mar 7, 2023

ArashPartow closed this Mar 7, 2023

dg0yt mentioned this pull request Mar 7, 2023

[VTK] VTK ExprTk cmake patch #30058

Closed

5 tasks

ArashPartow mentioned this pull request Dec 30, 2024

[exprtk] Add versions 0.0.2 #42996

Closed

4 tasks

ArashPartow mentioned this pull request Dec 31, 2024

[exprtk] Add version 0.0.3 2024-01-01 #43036

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[VTK] VTK ExprTk cmake patch #29801

[VTK] VTK ExprTk cmake patch #29801

ArashPartow commented Feb 23, 2023

ArashPartow commented Feb 23, 2023

dg0yt commented Feb 23, 2023

ArashPartow commented Feb 23, 2023

ArashPartow commented Feb 23, 2023 •

edited

Loading

ArashPartow commented Feb 24, 2023

JavierMatosD Feb 24, 2023

ArashPartow Feb 25, 2023

JavierMatosD Feb 24, 2023

ArashPartow Feb 24, 2023 •

edited

Loading

[VTK] VTK ExprTk cmake patch #29801

[VTK] VTK ExprTk cmake patch #29801

Conversation

ArashPartow commented Feb 23, 2023

ArashPartow commented Feb 23, 2023

dg0yt commented Feb 23, 2023

ArashPartow commented Feb 23, 2023

ArashPartow commented Feb 23, 2023 • edited Loading

ArashPartow commented Feb 24, 2023

JavierMatosD Feb 24, 2023

Choose a reason for hiding this comment

ArashPartow Feb 25, 2023

Choose a reason for hiding this comment

JavierMatosD Feb 24, 2023

Choose a reason for hiding this comment

ArashPartow Feb 24, 2023 • edited Loading

Choose a reason for hiding this comment

ArashPartow commented Feb 23, 2023 •

edited

Loading

ArashPartow Feb 24, 2023 •

edited

Loading