🎉 Added OGRE 13.3.1

This commit is contained in:
Edgar 2022-02-23 15:05:42 +00:00 committed by GitHub
parent e5a748ea11
commit 7b48ea6621
7 changed files with 44 additions and 1 deletions

View File

@ -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]"

View File

@ -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"

View File

@ -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} "$<$<CONFIG:Debug>:${${PREFIX}_DBG}>$<$<NOT:$<CONFIG:Debug>>:${${PREFIX}_REL}>")
elseif (${PREFIX}_REL)
set(${PREFIX} ${${PREFIX}_REL})
elseif (${PREFIX}_DBG)

View File

@ -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)

View File

@ -3,5 +3,5 @@ versions:
folder: "1.11"
"1.12.13":
folder: "1.12"
"13.2.4":
"13.3.1":
folder: "13"