.github/workflows/conan-pkg.yml

@@ -59,5 +59,5 @@ jobs:
           CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }}
           CONAN_PROFILE: ${{ matrix.config.conan-profile }}
         run: |
-          conan remote add conan-afg https://conan.anotherfoxguy.com
+          conan remote add ror-v2 https://artifactory.anotherfoxguy.com/artifactory/api/conan/rigs-of-rods
           python build.py

.gitignore

@@ -2,4 +2,3 @@ build/
 tmp/
 upload.*
 .idea/
-build_tmp.py

build.py

@@ -39,4 +39,4 @@ data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run(
     ['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split()))
 
 for d in data:
-    system(f"conan upload {d} -r conan-afg --all --force")
+    system(f"conan upload {d} -r ror-v2 --all --force")

mygui/all/conanfile.py

@@ -42,7 +42,7 @@ class MyGUIConan(ConanFile):
     def package_info(self):
         self.cpp_info.includedirs = ['include/MYGUI']
         # Directories where libraries can be found
-        self.cpp_info.libdirs = ['lib', f'lib/{self.settings.build_type}']
+        self.cpp_info.libdirs = ['lib', 'lib/release', 'lib/debug']
         self.cpp_info.libs = tools.collect_libs(self)
 
     def package_id(self):

ogre/1.11/conanfile.py

@@ -42,20 +42,12 @@ class OGREConan(ConanFile):
             "find_package(FreeImage)",
             "find_package(ConanFreeImage)",
         )
-        tools.replace_in_file(
-            "CMake/Dependencies.cmake",
-            "find_package(ZZip)",
-            "find_package(ConanZZip)",
-        )
         tools.replace_in_file(
             "CMake/Packages/FindDirectX11.cmake",
             'find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS "',
             'find_path(DirectX11_INCLUDE_DIR NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NAMES d3d11.h HINTS "',
         )
-        shutil.copyfile(
-            "patches/FindFreeImage.cmake", "CMake/Packages/FindConanFreeImage.cmake"
-        )
-        shutil.copyfile("patches/FindZZip.cmake", "CMake/Packages/FindConanZZip.cmake")
+        shutil.copyfile("patches/FindFreeImage.cmake", "CMake/Packages/FindConanFreeImage.cmake")
         for patch in self.conan_data["patches"][self.version]:
             tools.patch(**patch)
 

ogre/1.11/patches/FindZZip.cmake

@@ -1,5 +0,0 @@
-include(Findzziplib)
-
-set(ZZip_FOUND "${zziplib_FOUND}" CACHE BOOL "Conan patch for zziplib" FORCE)
-set(ZZip_INCLUDE_DIRS "${zziplib_INCLUDE_DIR}" CACHE STRING "Conan patch for zziplib" FORCE)
-set(ZZip_LIBRARIES "${zziplib_LIBRARIES}" CACHE STRING "Conan patch for zziplib" FORCE)

ogre/13/conandata.yml

@@ -17,12 +17,6 @@ sources:
   "13.4.2":
     url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.4.2.tar.gz"
     sha256: "df5fe86d3fe5ae70c022f791567ca7476e69ffa20123774b37f2b04b605ab102"
-  "13.4.3":
-    url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.4.3.tar.gz"
-    sha256: "acf5fe60618566fb5590feba92d22291c63d4618ab66b95ec7ddc5774d11c439"
-  "13.4.4":
-    url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.4.4.tar.gz"
-    sha256: "7cf05dbb3acbfc9326daecb60429a8ae9ce7625fb425e6a29de00cf77454596f"
 patches:
   "13.2.4":
     - patch_file: "patches/13.2.4/CMakeLists.txt.patch"
@@ -48,14 +42,6 @@ patches:
     - patch_file: "patches/13.3.1/CMakeLists.txt.patch"
     - patch_file: "patches/13.3.1/pugixml-fix.patch"
     - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
-  "13.4.3":
-    - patch_file: "patches/13.3.1/CMakeLists.txt.patch"
-    - patch_file: "patches/13.3.1/pugixml-fix.patch"
-    - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
-  "13.4.4":
-    - patch_file: "patches/13.3.1/CMakeLists.txt.patch"
-    - patch_file: "patches/13.3.1/pugixml-fix.patch"
-    - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch"
 requirements:
   - "zlib/[1.x]"
   - "zziplib/[0.13.x]"

ogre/config.yml

@@ -1,5 +1,5 @@
 versions:
   "1.11.6.1":
     folder: "1.11"
-  "13.4.4":
+  "13.4.2":
     folder: "13"