mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
c8021b4675
* [opencascade] fix #16252 by exporting includ directories with the targets and replacing internal includes from #include "..." to #include<...> post installation * [opencascade] added port version * [opencascade] update SHA of versions/o-/opencascade.json * Update ports/opencascade/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/opencascade/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/opencascade/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * remove commented line for BUILD_INTERFACE * updated version * remove replacement of includes form #include <...> to #include "..." * update port version * added fix-install-prefix-path.patch, which was removed by #15997 * fix fix-install-prefix-path.patch * update port version * Update ports/opencascade/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update port version * [opencascade]Revert "remove replacement of includes form #include <...> to #include "..."" also refined regex to allow white spaces between # and 'include' This reverts commit 4b362739f5e57449b3d6b1fcd6f2817b3be144a4. * [opencascade] update port version * [opencascade] change exported include directory from include/opencascade to include * [opencascade] update port version Co-authored-by: bloess <josua.bloess@uni-bayreuth.de> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
16 lines
839 B
Diff
16 lines
839 B
Diff
diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
|
|
index e391ddf..c926c49 100644
|
|
--- a/adm/templates/OpenCASCADEConfig.cmake.in
|
|
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
|
|
@@ -24,6 +24,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
|
|
# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
|
|
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
|
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
|
if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
|
|
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
|
endif()
|
|
--
|
|
2.14.3.windows.1
|
|
|