aboutsummaryrefslogtreecommitdiffstats
path: root/testing/opencascade/cmake_fix_install_dir.patch
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-02-23 14:52:55 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-02-23 15:17:35 +0000
commit5c80b832e5a732b376d20aabbbb15eb93162a218 (patch)
tree8725834ed728ae70a944685c30e5ec469c0827f5 /testing/opencascade/cmake_fix_install_dir.patch
parent3f471b06bb5c16653d1741de279486b27859206f (diff)
downloadaports-5c80b832e5a732b376d20aabbbb15eb93162a218.tar.bz2
aports-5c80b832e5a732b376d20aabbbb15eb93162a218.tar.xz
testing/opencascade: update cmake_fix_install_dir patch
Diffstat (limited to 'testing/opencascade/cmake_fix_install_dir.patch')
-rw-r--r--testing/opencascade/cmake_fix_install_dir.patch17
1 files changed, 10 insertions, 7 deletions
diff --git a/testing/opencascade/cmake_fix_install_dir.patch b/testing/opencascade/cmake_fix_install_dir.patch
index 12d1d1b697..f7340a97a7 100644
--- a/testing/opencascade/cmake_fix_install_dir.patch
+++ b/testing/opencascade/cmake_fix_install_dir.patch
@@ -2,9 +2,11 @@ Fixes:
> CMake Error at cmake_install.cmake:8340 (configure_file):
> configure_file Problem configuring file
First posted on Arch Linux
---- occt-V7_1_0/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100
-+++ occt-V7_1_0.new/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100
-@@ -906,7 +906,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b445de..1c6a41b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1122,7 +1122,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
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)")
@@ -13,10 +15,11 @@ First posted on Arch Linux
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})
-diff -aur occt-V7_1_0/adm/cmake/occt_macros.cmake occt-V7_1_0.new/adm/cmake/occt_macros.cmake
---- occt-V7_1_0/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100
-+++ occt-V7_1_0.new/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 8220ecd..d1ceea6 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)