diff --git a/ogre/13/conandata.yml b/ogre/13/conandata.yml index b8ae377..da4eb22 100644 --- a/ogre/13/conandata.yml +++ b/ogre/13/conandata.yml @@ -2,11 +2,18 @@ sources: "13.2.4": url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.2.4.tar.gz" sha256: "210abe551ca375a79eb45a3802e874108055999fa7292365734689a159dec4b3" + "13.3.1": + url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.3.1.tar.gz" + sha256: "8b874952a8f6161b3307c29df00f21a0d5710de5e85bf41383b405717da07bb4" patches: "13.2.4": - patch_file: "patches/13.2.4/CMakeLists.txt.patch" - patch_file: "patches/13.2.4/pugixml-fix.patch" - patch_file: "patches/13.2.4/FindPkgMacros.cmake.patch" + "13.3.1": + - 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]" diff --git a/ogre/13/patches/13.3.1/CMakeLists.txt.patch b/ogre/13/patches/13.3.1/CMakeLists.txt.patch new file mode 100644 index 0000000..e6b40a1 --- /dev/null +++ b/ogre/13/patches/13.3.1/CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -80,6 +80,7 @@ + + # Include necessary submodules + set(CMAKE_MODULE_PATH ++ "${CMAKE_BINARY_DIR}" + "${PROJECT_SOURCE_DIR}/CMake" + "${PROJECT_SOURCE_DIR}/CMake/Utils" + "${PROJECT_SOURCE_DIR}/CMake/Packages" diff --git a/ogre/13/patches/13.3.1/FindPkgMacros.cmake.patch b/ogre/13/patches/13.3.1/FindPkgMacros.cmake.patch new file mode 100644 index 0000000..6d62fc4 --- /dev/null +++ b/ogre/13/patches/13.3.1/FindPkgMacros.cmake.patch @@ -0,0 +1,11 @@ +--- CMake/Utils/FindPkgMacros.cmake ++++ CMake/Utils/FindPkgMacros.cmake +@@ -82,7 +82,7 @@ + if (${PREFIX}_FWK) + set(${PREFIX} ${${PREFIX}_FWK}) + elseif (${PREFIX}_REL AND ${PREFIX}_DBG) +- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) ++ set(${PREFIX} "$<$:${${PREFIX}_DBG}>$<$>:${${PREFIX}_REL}>") + elseif (${PREFIX}_REL) + set(${PREFIX} ${${PREFIX}_REL}) + elseif (${PREFIX}_DBG) diff --git a/ogre/13/patches/13.3.1/pugixml-fix.patch b/ogre/13/patches/13.3.1/pugixml-fix.patch new file mode 100644 index 0000000..b132061 --- /dev/null +++ b/ogre/13/patches/13.3.1/pugixml-fix.patch @@ -0,0 +1,15 @@ +--- Tools/XMLConverter/CMakeLists.txt ++++ Tools/XMLConverter/CMakeLists.txt +@@ -21,9 +21,10 @@ + src/OgreXMLSkeletonSerializer.cpp + ) + ++message("Fixing OgreXMLConverter") + add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES}) +-target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) +-target_link_libraries(OgreXMLConverter OgreMain pugixml) ++target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${pugixml_INCLUDE_DIRS}) ++target_link_libraries(OgreXMLConverter OgreMain pugixml::pugixml) + + if (OGRE_PROJECT_FOLDERS) + set_property(TARGET OgreXMLConverter PROPERTY FOLDER Tools) diff --git a/ogre/config.yml b/ogre/config.yml index ca813e2..b0879e5 100644 --- a/ogre/config.yml +++ b/ogre/config.yml @@ -3,5 +3,5 @@ versions: folder: "1.11" "1.12.13": folder: "1.12" - "13.2.4": + "13.3.1": folder: "13" \ No newline at end of file diff --git a/tools/cpfd.sh b/tools/cpfd similarity index 100% rename from tools/cpfd.sh rename to tools/cpfd diff --git a/tools/diffo.sh b/tools/diffo similarity index 100% rename from tools/diffo.sh rename to tools/diffo