Differential D12331 Diff 29947 files/OCCT-creation-of-custom-sh.patch

Changeset View

Standalone View

				From 0df9b2c485da92c6e9fdd6d4b5ea1ec6588bd66f Mon Sep 17 00:00:00 2001
				From: Bernd Waibel <waebbl-gentoo@posteo.net>
				Date: Fri, 16 Apr 2021 14:32:24 +0200
				Subject: [PATCH] fix creation of custom.sh script

				Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
				---
				CMakeLists.txt \| 10 +---------
				1 file changed, 1 insertion(+), 9 deletions(-)

				diff --git a/CMakeLists.txt b/CMakeLists.txt
				index 100d6133..7799b73a 100644
				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -909,15 +909,7 @@ else()
				endif()

				# change custom.bat/sh
				-if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
				- file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
				-
				- set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
				-
				- file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
				-else()
				- OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
				-endif()
				+OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")

				if (WIN32)
				set (THIRDPARTY_DIR_REPLACE "%THIRDPARTY_DIR%")
				--
				2.31.1