diff options
| -rw-r--r-- | 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch | 101 | ||||
| -rw-r--r-- | vtk.spec | 1 |
2 files changed, 0 insertions, 102 deletions
diff --git a/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch index cf20ea2..f48302b 100644 --- a/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch +++ b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch @@ -1,89 +1,3 @@ -From f62eb94a049482c6dc6f5d830087a91b6bbae886 Mon Sep 17 00:00:00 2001 -From: mimanchiok <mimanchiok@qq.com> -Date: Thu, 7 Aug 2025 19:33:51 +0800 -Subject: [PATCH] fix tao/pegtl/contrib/tracer.hpp: No such file or directory - ---- - CMake/FindPEGTL.cmake | 62 +++++++++++++++++----------- - IO/MotionFX/vtkMotionFXCFGGrammar.h | 2 +- - IO/MotionFX/vtkMotionFXCFGReader.cxx | 6 +-- - ThirdParty/pegtl/CMakeLists.txt | 1 - - 4 files changed, 41 insertions(+), 30 deletions(-) - -diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake -index 4c9e108b..87ab49d6 100644 ---- a/CMake/FindPEGTL.cmake -+++ b/CMake/FindPEGTL.cmake -@@ -20,31 +20,43 @@ - # - # PEGTL::PEGTL - --find_path(PEGTL_INCLUDE_DIR -- NAMES pegtl/version.hpp -- PATH_SUFFIXES tao -- DOC "Path to PEGTL headers") --mark_as_advanced(PEGTL_INCLUDE_DIR) -+message(STATUS "Searching for PEGTL") -+find_package(PEGTL CONFIG REQUIRED) -+if(TARGET taocpp::pegtl) -+ message(STATUS "Searching for PEGTL - found target taocpp::pegtl") -+ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) -+ if(NOT TARGET PEGTL::PEGTL) -+ add_library(PEGTL::PEGTL IMPORTED INTERFACE) -+ target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl) -+ endif() -+else() -+ find_path(PEGTL_INCLUDE_DIR -+ NAMES pegtl/version.hpp -+ PATH_SUFFIXES tao -+ DOC "Path to PEGTL headers") -+ mark_as_advanced(PEGTL_INCLUDE_DIR) - --if (PEGTL_INCLUDE_DIR) -- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header -- REGEX "TAO_PEGTL_VERSION") -- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") -- set(PEGTL_VERSION "${CMAKE_MATCH_1}") -- unset(_pegtl_version_header) -- unset(_pegtl_version_match) --endif () -+ if (PEGTL_INCLUDE_DIR) -+ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header -+ REGEX "TAO_PEGTL_VERSION") -+ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") -+ set(PEGTL_VERSION "${CMAKE_MATCH_1}") -+ unset(_pegtl_version_header) -+ unset(_pegtl_version_match) -+ endif () - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(PEGTL -- REQUIRED_VARS PEGTL_INCLUDE_DIR -- VERSION_VAR PEGTL_VERSION) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(PEGTL -+ REQUIRED_VARS PEGTL_INCLUDE_DIR -+ VERSION_VAR PEGTL_VERSION) - --if (PEGTL_FOUND) -- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") -- if (NOT TARGET PEGTL::PEGTL) -- add_library(PEGTL::PEGTL INTERFACE IMPORTED) -- set_target_properties(PEGTL::PEGTL PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") -- endif () --endif () -+ if (PEGTL_FOUND) -+ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") -+ if (NOT TARGET PEGTL::PEGTL) -+ add_library(PEGTL::PEGTL INTERFACE IMPORTED) -+ set_target_properties(PEGTL::PEGTL PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") -+ endif () -+ message(STATUS "Searching for PEGTL - found") -+ endif () -+endif () -\ No newline at end of file diff --git a/IO/MotionFX/vtkMotionFXCFGGrammar.h b/IO/MotionFX/vtkMotionFXCFGGrammar.h index e58eeb80..67bc5d88 100644 --- a/IO/MotionFX/vtkMotionFXCFGGrammar.h @@ -128,18 +42,3 @@ index 9cbf553c..7417a418 100644 } return false; } -diff --git a/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt -index 27c89427..d2fd1267 100644 ---- a/ThirdParty/pegtl/CMakeLists.txt -+++ b/ThirdParty/pegtl/CMakeLists.txt -@@ -13,7 +13,6 @@ vtk_module_third_party( - "2.8.3" - EXTERNAL - PACKAGE PEGTL -- VERSION 2.0.0 - TARGETS PEGTL::PEGTL - STANDARD_INCLUDE_DIRS) - --- -2.27.0 - @@ -27,7 +27,6 @@ Source101: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_01 Source102: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_02 Patch01: 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch -#Patch9000: 9000-fix-build-error-for-aarch64.patch URL: https://vtk.org/ |