diff options
| author | dweckmann <didier.weckmann@ircad.fr> | 2021-01-05 21:07:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 12:07:14 -0800 |
| commit | 215d38b4adf65e8c5283b554d205e70f9e4f12eb (patch) | |
| tree | c8a5f08c9a4210d6bba1bceaf7a25fc57c9aa2ea | |
| parent | 4907797add3448cdb333b1b7d1d5de2f43770186 (diff) | |
| download | vcpkg-215d38b4adf65e8c5283b554d205e70f9e4f12eb.tar.gz vcpkg-215d38b4adf65e8c5283b554d205e70f9e4f12eb.zip | |
[ogre] make zziplib, freeimage, assimp, freetype and strict resource manager, optional features (#15194)
| -rw-r--r-- | ports/ogre/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/ogre/vcpkg.json | 52 |
2 files changed, 52 insertions, 15 deletions
diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 76de8a483..c14da2fac 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -30,12 +30,19 @@ endif() # Configure features vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP + overlay OGRE_BUILD_COMPONENT_OVERLAY + zziplib OGRE_CONFIG_ENABLE_ZIP + strict OGRE_RESOURCEMANAGER_STRICT ) +# OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 88d46d937..a92d9ea9b 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,39 +1,69 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 3, + "port-version": 4, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ - "assimp", - "freeimage", - "freetype", - { - "name": "imgui", - "features": [ - "freetype" - ] - }, "pugixml", "sdl2", - "zlib", + "zlib" + ], + "default-features": [ + "assimp", + "freeimage", + "overlay", + "strict", "zziplib" ], "features": { + "assimp": { + "description": "Use assimp", + "dependencies": [ + "assimp" + ] + }, "csharp": { "description": "Build csharp bindings" }, "d3d9": { "description": "Build Direct3D9 RenderSystem" }, + "freeimage": { + "description": "Build with FreeImage support", + "dependencies": [ + "freeimage" + ] + }, "java": { "description": "Build Java (JNI) bindings" }, + "overlay": { + "description": "Build overlay component", + "dependencies": [ + "freetype", + { + "name": "imgui", + "features": [ + "freetype" + ] + } + ] + }, "python": { "description": "Build Python bindings", "dependencies": [ "python3" ] + }, + "strict": { + "description": "Force Ogre resource manager to be strict with group names and resource names" + }, + "zziplib": { + "description": "Build with zziplib support (GPL)", + "dependencies": [ + "zziplib" + ] } } } |