]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Patch for debian packaging of OCCT-7.3.0p3
authorAnthony Geay <anthony.geay@edf.fr>
Fri, 26 Apr 2019 05:37:07 +0000 (07:37 +0200)
committerAnthony Geay <anthony.geay@edf.fr>
Fri, 26 Apr 2019 05:37:07 +0000 (07:37 +0200)
config/patches/edf/OCCT-7.3.0p3.patch [new file with mode: 0644]

diff --git a/config/patches/edf/OCCT-7.3.0p3.patch b/config/patches/edf/OCCT-7.3.0p3.patch
new file mode 100644 (file)
index 0000000..e8b94b4
--- /dev/null
@@ -0,0 +1,20 @@
+diff -ruN occ-7.3.0p3_base/CMakeLists.txt occ-7.3.0p3/CMakeLists.txt
+--- occ-7.3.0p3_base/CMakeLists.txt    2019-04-26 07:25:25.310312723 +0200
++++ occ-7.3.0p3/CMakeLists.txt 2019-04-26 07:23:09.000000000 +0200
+@@ -121,6 +121,7 @@
+     set (CMAKE_INSTALL_PREFIX "C:/opencascade-${OCC_VERSION_STRING_EXT}")
+   endif()
+   set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}")
++  set (INSTALL_DIR_PDM "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}")
+ else()
+   file (TO_CMAKE_PATH "${INSTALL_DIR}" INSTALL_DIR)
+   set (INSTALL_DIR "${INSTALL_DIR}" CACHE PATH "${INSTALL_DIR_DESCR}" FORCE)
+@@ -1107,7 +1108,7 @@
+ 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)")
+-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
++install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR_PDM}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+ foreach (OCCT_MODULE ${OCCT_MODULES})
+   if (BUILD_MODULE_${OCCT_MODULE})