[assimp] Fix cmake config name and add cmake version (#14554)

* [assimp] Fix cmake cofig name and add cmake version

* [ogre] Update 'Assimp' to 'assimp

ports/assimp/CONTROL

@@ -1,6 +1,6 @@
 Source: assimp
 Version: 5.0.1
-Port-Version: 3
+Port-Version: 4
 Homepage: https://github.com/assimp/assimp
 Description: The Open Asset import library
 Build-Depends: zlib, rapidjson, minizip, stb, kubazip, irrlicht, polyclipping, utfcpp, poly2tri

ports/assimp/irrlicht.patch

@@ -1,82 +1,61 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 453fdff..3a02956 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -132,7 +132,6 @@ OPTION ( IGNORE_GIT_HASH
- 
- find_package(Stb REQUIRED)
- include_directories(${Stb_INCLUDE_DIR})
--find_package(irrXML CONFIG REQUIRED)
- find_package(utf8cpp CONFIG REQUIRED)
- link_libraries(utf8cpp)
- find_package(RapidJSON CONFIG REQUIRED)
-@@ -388,7 +387,7 @@ ENDIF( BUILD_DOCS )
- 
- # Look for system installed irrXML
- IF ( SYSTEM_IRRXML )
--  FIND_PACKAGE( irrXML REQUIRED )
-+  FIND_PACKAGE( irrlicht CONFIG REQUIRED )
- ENDIF( SYSTEM_IRRXML )
- 
- # Search for external dependencies, and build them from source if not found
-diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
-index f5553e5..5cffa0c 100644
---- a/code/CMakeLists.txt
-+++ b/code/CMakeLists.txt
-@@ -862,7 +862,7 @@ SET( Extra_SRCS
- SOURCE_GROUP( Extra FILES ${Extra_SRCS})
- 
- # irrXML
--  find_package(irrXML CONFIG REQUIRED)
-+  find_package(irrlicht CONFIG REQUIRED)
- 
- # polyclipping
-   find_package(polyclipping CONFIG REQUIRED)
-@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC
- 
-   TARGET_LINK_LIBRARIES(assimp
-       polyclipping::polyclipping
--      irrXML::irrXML
-+      Irrlicht
-       minizip::minizip
-       ZLIB::ZLIB
-       kubazip::kubazip
-diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp
-index 525a084..0cbca48 100644
---- a/code/X3D/FIReader.cpp
-+++ b/code/X3D/FIReader.cpp
-@@ -654,8 +654,8 @@ public:
-         return currentNodeType;
-     }
- 
--    virtual int getAttributeCount() const /*override*/ {
--        return static_cast<int>(attributes.size());
-+    virtual unsigned int getAttributeCount() const /*override*/ {
-+        return static_cast<unsigned int>(attributes.size());
-     }
- 
-     virtual const char* getAttributeName(int idx) const /*override*/ {
-@@ -1733,7 +1733,7 @@ public:
-         return reader->getNodeType();
-     }
- 
--    virtual int getAttributeCount() const /*override*/ {
-+    virtual unsigned int getAttributeCount() const /*override*/ {
-         return reader->getAttributeCount();
-     }
- 
-diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h
-index 77cfd5e..ba584a0 100644
---- a/include/assimp/irrXMLWrapper.h
-+++ b/include/assimp/irrXMLWrapper.h
-@@ -133,8 +133,8 @@ public:
- 
-     // ----------------------------------------------------------------------------------
-     //! Returns size of file in bytes
--    virtual int getSize()   {
--        return (int)data.size();
-+    virtual long getSize() const override {
-+        return (long)data.size();
-     }
- 
- private:
+diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
+index f5553e5..5cffa0c 100644
+--- a/code/CMakeLists.txt
++++ b/code/CMakeLists.txt
+@@ -862,7 +862,7 @@ SET( Extra_SRCS
+ SOURCE_GROUP( Extra FILES ${Extra_SRCS})
+ 
+ # irrXML
+-  find_package(irrXML CONFIG REQUIRED)
++  find_package(irrlicht CONFIG REQUIRED)
+ 
+ # polyclipping
+   find_package(polyclipping CONFIG REQUIRED)
+@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC
+ 
+   TARGET_LINK_LIBRARIES(assimp
+       polyclipping::polyclipping
+-      irrXML::irrXML
++      Irrlicht
+       minizip::minizip
+       ZLIB::ZLIB
+       kubazip::kubazip
+diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp
+index 525a084..0cbca48 100644
+--- a/code/X3D/FIReader.cpp
++++ b/code/X3D/FIReader.cpp
+@@ -654,8 +654,8 @@ public:
+         return currentNodeType;
+     }
+ 
+-    virtual int getAttributeCount() const /*override*/ {
+-        return static_cast<int>(attributes.size());
++    virtual unsigned int getAttributeCount() const /*override*/ {
++        return static_cast<unsigned int>(attributes.size());
+     }
+ 
+     virtual const char* getAttributeName(int idx) const /*override*/ {
+@@ -1733,7 +1733,7 @@ public:
+         return reader->getNodeType();
+     }
+ 
+-    virtual int getAttributeCount() const /*override*/ {
++    virtual unsigned int getAttributeCount() const /*override*/ {
+         return reader->getAttributeCount();
+     }
+ 
+diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h
+index 77cfd5e..ba584a0 100644
+--- a/include/assimp/irrXMLWrapper.h
++++ b/include/assimp/irrXMLWrapper.h
+@@ -133,8 +133,8 @@ public:
+ 
+     // ----------------------------------------------------------------------------------
+     //! Returns size of file in bytes
+-    virtual int getSize()   {
+-        return (int)data.size();
++    virtual long getSize() const override {
++        return (long)data.size();
+     }
+ 
+ private:

ports/assimp/portfile.cmake

@@ -72,8 +72,8 @@ vcpkg_fixup_cmake_targets()
 vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below
 vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake ASSIMP_CONFIG)
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake "
+file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake "
 include(CMakeFindDependencyMacro)
 find_dependency(ZLIB)
 find_dependency(irrlicht CONFIG)

ports/ogre/fix-dependency.patch

@@ -21,7 +21,7 @@ index 2ae0b66..e6c55cd 100644
  
  # Assimp
 -find_package(ASSIMP QUIET)
-+find_package(Assimp CONFIG REQUIRED)
++find_package(assimp CONFIG REQUIRED)
  macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "")
  
  if(ASSIMP_FOUND)

ports/ogre/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ogre",
   "version-string": "1.12.9",
-  "port-version": 2,
+  "port-version": 3,
   "description": "3D Object-Oriented Graphics Rendering Engine",
   "homepage": "https://github.com/OGRECave/ogre",
   "dependencies": [