diff options
Diffstat (limited to 'cad/opencascade/files')
| -rw-r--r-- | cad/opencascade/files/patch-CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cad/opencascade/files/patch-adm_cmake_occt__csf.cmake | 4 | ||||
| -rw-r--r-- | cad/opencascade/files/patch-adm_cmake_occt__macros.cmake | 25 |
3 files changed, 10 insertions, 25 deletions
diff --git a/cad/opencascade/files/patch-CMakeLists.txt b/cad/opencascade/files/patch-CMakeLists.txt index 244ffaa4f286..3050b6fa3785 100644 --- a/cad/opencascade/files/patch-CMakeLists.txt +++ b/cad/opencascade/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2025-02-17 22:00:23 UTC +--- CMakeLists.txt.orig 2025-05-20 11:17:10 UTC +++ CMakeLists.txt -@@ -1114,7 +1114,7 @@ endif() +@@ -1101,7 +1101,7 @@ endif() endif() # validating custom.bat/sh for changes @@ -9,7 +9,7 @@ file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT) string(FIND "${CUSTOM_CONTENT}" "${ADDITIONAL_CUSTOM_CONTENT}" pos) if (pos EQUAL -1) -@@ -1359,7 +1359,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF +@@ -1340,7 +1340,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF endforeach() # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)") diff --git a/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake b/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake index 406099bd4b2b..132477de5b76 100644 --- a/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake +++ b/cad/opencascade/files/patch-adm_cmake_occt__csf.cmake @@ -1,6 +1,6 @@ ---- adm/cmake/occt_csf.cmake.orig 2021-10-30 11:13:37 UTC +--- adm/cmake/occt_csf.cmake.orig 2025-05-20 11:17:10 UTC +++ adm/cmake/occt_csf.cmake -@@ -142,7 +142,6 @@ else() +@@ -161,7 +161,6 @@ else() set (CSF_OpenGlLibs "GL EGL") endif() set (CSF_OpenGlesLibs "EGL GLESv2") diff --git a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake index 5cf175f55e81..98aef290c999 100644 --- a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake +++ b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake @@ -1,6 +1,6 @@ ---- adm/cmake/occt_macros.cmake.orig 2025-02-17 22:00:23 UTC +--- adm/cmake/occt_macros.cmake.orig 2025-05-20 11:17:10 UTC +++ adm/cmake/occt_macros.cmake -@@ -68,7 +68,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) +@@ -64,7 +64,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) elseif(APPLE) set (OS_WITH_BIT "mac${COMPILER_BITNESS}") else() @@ -9,16 +9,16 @@ endif() endmacro() -@@ -478,7 +478,7 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_RO +@@ -435,7 +435,7 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_RO set (OCCT_HEADER_FILES_INSTALLATION ${OCCT_HEADER_FILES_COMPLETE}) - list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|lxx)") + list (FILTER OCCT_HEADER_FILES_INSTALLATION INCLUDE REGEX ".*[.](h|hxx|lxx)$") - install (FILES ${OCCT_HEADER_FILES_INSTALLATION} DESTINATION "${INSTALL_DIR}/${THE_OCCT_INSTALL_DIR_PREFIX}") + install (FILES ${OCCT_HEADER_FILES_INSTALLATION} DESTINATION "${THE_OCCT_INSTALL_DIR_PREFIX}") endfunction() # Macro to configure and install Standard_Version.hxx file -@@ -489,7 +489,7 @@ macro (CONFIGURE_AND_INSTALL_VERSION_HEADER) +@@ -446,7 +446,7 @@ macro (CONFIGURE_AND_INSTALL_VERSION_HEADER) set(BUILD_OCCT_VERSION_EXT "${OCC_VERSION_STRING_EXT}" CACHE STRING "OCCT Version string. Used only for caching, can't impact on build. For modification of version, please check adm/cmake/version.cmake" FORCE) mark_as_advanced(BUILD_OCCT_VERSION_EXT) string(TIMESTAMP OCCT_VERSION_DATE "%Y-%m-%d" UTC) @@ -27,18 +27,3 @@ endif() endmacro() -@@ -762,12 +762,12 @@ macro (OCCT_UPDATE_TARGET_FILE) - - install (CODE - "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) -- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") -+ file (GLOB ALL_OCCT_TARGET_FILES \"$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") - foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) - file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) - file (REMOVE \"\${TARGET_FILENAME}\") - foreach (line IN LISTS TARGET_FILE_CONTENT) -- string (REGEX REPLACE \"[\\\\]?[\\\$]{OCCT_INSTALL_BIN_LETTER}\" \"\${OCCT_INSTALL_BIN_LETTER}\" line \"\${line}\") -+ string (REGEX REPLACE \"[\\\\]?[\\\$]{OCCT_INSTALL_BIN_LETTER}\" \"${OCCT_INSTALL_BIN_LETTER}\" line \"\${line}\") - file (APPEND \"\${TARGET_FILENAME}\" \"\${line}\\n\") - endforeach() - endforeach()") |