diff options
| author | plevy <paul.levy@gmail.com> | 2018-07-17 18:47:24 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-17 15:47:24 -0700 |
| commit | a1f0dcd02beb364e7f3f99a784229b64d161b234 (patch) | |
| tree | e463bb18be2e307ce7e482c9ce0be56ae99de783 | |
| parent | 8d389323a75c49c09647a1f87184b1a0ef4fbbf6 (diff) | |
| download | vcpkg-a1f0dcd02beb364e7f3f99a784229b64d161b234.tar.gz vcpkg-a1f0dcd02beb364e7f3f99a784229b64d161b234.zip | |
[osgearth] Update osgPlugins folder to 3.6.2 (#3920)
* Update osgPlugins folder to 3.6.2
Update osgPlugins folder to 3.6.2 to stay in sync with osg package.
* [osgearth] Detect osgplugins version automatically
| -rw-r--r-- | ports/osgearth/CONTROL | 2 | ||||
| -rw-r--r-- | ports/osgearth/portfile.cmake | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index 34c5bad24..c409a35a9 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,4 +1,4 @@ Source: osgearth -Version: 2.9 +Version: 2.9-1 Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping. Build-Depends: osg diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 9f740e2d2..3c6a55a26 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -9,6 +9,13 @@ if(VCPKG_CRT_LINKAGE STREQUAL static) message(FATAL_ERROR "osgearth does not support static CRT linkage") endif() +file(GLOB OSG_PLUGINS_SUBDIR ${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*) +list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH) +if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) + message(FATAL_ERROR "Could not determine osg version") +endif() +string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth @@ -26,7 +33,7 @@ vcpkg_install_cmake() #Release set(OSGEARTH_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/osgearth) -set(OSGEARTH_TOOL_PLUGIN_PATH ${OSGEARTH_TOOL_PATH}/osgPlugins-3.5.6) +set(OSGEARTH_TOOL_PLUGIN_PATH ${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}) file(MAKE_DIRECTORY ${OSGEARTH_TOOL_PATH}) file(MAKE_DIRECTORY ${OSGEARTH_TOOL_PLUGIN_PATH}) @@ -44,7 +51,7 @@ file(REMOVE_RECURSE ${OSGDB_PLUGINS}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) set(OSGEARTH_DEBUG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/debug/tools/osgearth) -set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH ${OSGEARTH_DEBUG_TOOL_PATH}/osgPlugins-3.5.6) +set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH ${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}) file(MAKE_DIRECTORY ${OSGEARTH_DEBUG_TOOL_PATH}) file(MAKE_DIRECTORY ${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}) @@ -61,4 +68,4 @@ file(REMOVE_RECURSE ${OSGDB_DEBUG_PLUGINS}) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osgearth) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/osgearth/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/osgearth/copyright)
\ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/osgearth/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/osgearth/copyright) |