From a7925622edf6516dcdd3e6d9e8c29464cef69ac9 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 3 Sep 2024 08:52:22 +0000 Subject: [PATCH] Handle nix patches for V7_7_2 #5285 --- nix/build-all.py | 3 +++ nix/patches/occt/no_ExpToCasExe_7_7_2.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 nix/patches/occt/no_ExpToCasExe_7_7_2.patch diff --git a/nix/build-all.py b/nix/build-all.py index 8801082dce..8f63612434 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -588,6 +588,9 @@ if USE_OCCT and "occ" in targets: if OCCT_VERSION == "7.7.1": patches.append("./patches/occt/no_ExpToCasExe.patch") + if OCCT_VERSION == "7.7.2": + patches.append("./patches/occt/no_ExpToCasExe_7_7_2.patch") + if "wasm" in flags: patches.append("./patches/occt/no_em_js.patch") diff --git a/nix/patches/occt/no_ExpToCasExe_7_7_2.patch b/nix/patches/occt/no_ExpToCasExe_7_7_2.patch new file mode 100644 index 0000000000..8b9f924e83 --- /dev/null +++ b/nix/patches/occt/no_ExpToCasExe_7_7_2.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1bacca1a48..11f931ad39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -820,6 +820,8 @@ else() + OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE") + endif() + ++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe) ++ + # bison + if (BUILD_YACCLEX) + OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")