vcpkg/ports/opencascade/install-include-dir.patch

17 lines
683 B
Diff
Raw Normal View History

[opencascade] fix #16252 (#16513) * [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>
2021-03-23 06:19:06 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a80e39e6..bb6ab2db 100644
[opencascade] fix #16252 (#16513) * [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>
2021-03-23 06:19:06 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1273,6 +1273,11 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
[opencascade] fix #16252 (#16513) * [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>
2021-03-23 06:19:06 +08:00
endforeach()
set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED})
+foreach (OCCT_LIBRARY IN LISTS OCCT_LIBRARIES)
+ target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include/opencascade>) # OpenCASCADE_INCLUDE_DIR
+ target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include>) # vcpkg lock-in
[opencascade] fix #16252 (#16513) * [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>
2021-03-23 06:19:06 +08:00
+endforeach()
+
# Add all targets to the build-tree export set
export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake")