3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[opencascade] Fix link the debug of freetype.dll (#23939)

Browse Source 
* [opencascade] Fix link the debug of freetype.dll

* update version

* fix build error

* update version

* update patch

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
LilyWangLL 2022-05-10 05:12:27 +08:00 committed by GitHub
parent 83fc3b74c9
commit a02ef95400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/opencascade/fix-depend-freetype.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbcede5..66b127d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE)
if (USE_FREETYPE)
message (STATUS "Info: FreeType is used by OCCT")
add_definitions (-DHAVE_FREETYPE)
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
+ find_package(freetype CONFIG REQUIRED)
+ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES)
+ list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}")
else()
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")

25
ports/opencascade/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
fix-pdb-find.patch
fix-install-prefix-path.patch
install-include-dir.patch
fix-depend-freetype.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -49,22 +50,22 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade)
#make occt includes relative to source_file
list(APPEND ADDITIONAL_HEADERS
"ExprIntrp.tab.h"
"FlexLexer.h"
"glext.h"
"igesread.h"
"NCollection_Haft.h"
"OSD_PerfMeter.h"
"Standard_values.h"
"FlexLexer.h"
"glext.h"
"igesread.h"
"NCollection_Haft.h"
"OSD_PerfMeter.h"
"Standard_values.h"
)
file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx")
foreach(file_name IN LISTS files)
file(READ "${file_name}" filedata)
string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}")
foreach(extra_header IN LISTS ADDITIONAL_HEADERS)
string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}")
endforeach()
file(WRITE "${file_name}" "${filedata}")
file(READ "${file_name}" filedata)
string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}")
foreach(extra_header IN LISTS ADDITIONAL_HEADERS)
string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}")
endforeach()
file(WRITE "${file_name}" "${filedata}")
endforeach()
# Remove libd to lib, libd just has cmake files we dont want too

2
ports/opencascade/vcpkg.json
View File

@ -1,8 +1,10 @@
{
"name": "opencascade",
"version": "7.6.0",
"port-version": 1,
"description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
"homepage": "https://github.com/Open-Cascade-SAS/OCCT",
"license": "LGPL-2.1",
"supports": "!(uwp | osx | linux | arm)",
"dependencies": [
"freetype",

2
versions/baseline.json
View File

@ -5066,7 +5066,7 @@
},
"opencascade": {
"baseline": "7.6.0",
"port-version": 0
"port-version": 1
},
"opencc": {
"baseline": "2020-04-26",

5
versions/o-/opencascade.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0b043af5fd55a990d23a36523c82b005422ba75c",
"version": "7.6.0",
"port-version": 1
},
{
"git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d",
"version": "7.6.0",