Differential D12331 Diff 29947 files/OCCT-config-destination.patch

Changeset View

Standalone View

files/OCCT-config-destination.patch

This file was added.

				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -1156,7 +1156,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\" \"$ENV{DESTDIR}/${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")

				foreach (OCCT_MODULE ${OCCT_MODULES})
				if (BUILD_MODULE_${OCCT_MODULE})
				--- a/adm/cmake/occt_macros.cmake
				+++ b/adm/cmake/occt_macros.cmake
				@@ -558,7 +558,7 @@
				"cmake_policy(PUSH)
				cmake_policy(SET CMP0007 NEW)
				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}/${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}\")
				--- a/adm/cmake/occt_toolkit.cmake
				+++ b/adm/cmake/occt_toolkit.cmake
				@@ -227,7 +227,7 @@ if (EXECUTABLE_PROJECT)
				add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})

				install (TARGETS ${PROJECT_NAME}
				- DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
				+ DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")

				if (EMSCRIPTEN)
				install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.wasm DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
				@@ -253,14 +253,14 @@ else()

				install (TARGETS ${PROJECT_NAME}
				EXPORT OpenCASCADE${CURRENT_MODULE}Targets
				- RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
				- ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
				- LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
				+ RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
				+ ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
				+ LIBRARY DESTINATION "${INSTALL_DIR_LIB}")

				if (NOT WIN32)
				if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
				- set (LINK_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}")
				- set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
				+ set (LINK_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}")
				+ set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
				OCCT_CREATE_SYMLINK_TO_FILE (${LIBRARY_NAME} ${LINK_NAME})
				endif()
				endif()
				--- a/adm/templates/OpenCASCADEConfig.cmake.in
				+++ b/adm/templates/OpenCASCADEConfig.cmake.in
				@@ -26,7 +26,7 @@
				if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
				get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
				endif()
				-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
				+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$" OR OpenCASCADE_INSTALL_PREFIX MATCHES "/lib64$")
				get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
				endif()
				if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")