[ogre] no absolute paths

microsoft · Jan 27, 2022 · 038049e · 038049e
1 parent f4e258a
commit 038049e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
@@ -30,6 +30,7 @@ endif()
 # Configure features
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  FEATURES
     d3d9     OGRE_BUILD_RENDERSYSTEM_D3D9
     java     OGRE_BUILD_COMPONENT_JAVA
     python   OGRE_BUILD_COMPONENT_PYTHON
@@ -43,9 +44,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 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
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOGRE_BUILD_DEPENDENCIES=OFF
         -DOGRE_BUILD_SAMPLES=OFF
@@ -74,8 +74,8 @@ vcpkg_configure_cmake(
         -DOGRE_CMAKE_DIR=share/ogre
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -124,7 +124,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endforeach()
 endif()
 
+file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg)
+foreach(file ${share_cfgs})
+    vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..")
+endforeach()
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "ogre",
-  "version-string": "1.12.9",
-  "port-version": 5,
+  "version": "1.12.9",
+  "port-version": 6,
   "description": "3D Object-Oriented Graphics Rendering Engine",
   "homepage": "https://github.com/OGRECave/ogre",
   "dependencies": [
     "pugixml",
     "sdl2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "default-features": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4874,7 +4874,7 @@
     },
     "ogre": {
       "baseline": "1.12.9",
-      "port-version": 5
+      "port-version": 6
     },
     "ogre-next": {
       "baseline": "2019-10-20",

diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a",
+      "version": "1.12.9",
+      "port-version": 6
+    },
     {
       "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb",
       "version-string": "1.12.9",