diff --git a/ogre/13/conandata.yml b/ogre/13/conandata.yml index 101fa2f..3869cac 100644 --- a/ogre/13/conandata.yml +++ b/ogre/13/conandata.yml @@ -2,12 +2,19 @@ sources: "13.0.0": url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.0.0.tar.gz" sha256: "404c91b0ab27edb45a643bc268143589c8f5160125d531cbf5d958fa55136063" + "13.0.1": + url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.0.1.tar.gz" + sha256: "8d31a79d37f74e5af25e56a0a70928079e771f7cea50ef041e04bf235c3f701a" patches: "13.0.0": - patch_file: "patches/13.0.0/CMakeLists.txt.patch" - - patch_file: "patches/13.0.0/AddLibPNG.patch" - patch_file: "patches/13.0.0/pugixml-fix.patch" - patch_file: "patches/13.0.0/FindPkgMacros.cmake.patch" + "13.0.1": + - patch_file: "patches/13.0.1/CMakeLists.txt.patch" + - patch_file: "patches/13.0.1/pugixml-fix.patch" + - patch_file: "patches/13.0.1/FindPkgMacros.cmake.patch" + - patch_file: "patches/13.0.1/FixFindOpenGLES2.cmake.patch" requirements: - "zlib/[1.x]" - "zziplib/[0.13.x]" diff --git a/ogre/13/conanfile.py b/ogre/13/conanfile.py index 3710ec1..ece447e 100644 --- a/ogre/13/conanfile.py +++ b/ogre/13/conanfile.py @@ -8,7 +8,7 @@ class OGREConan(ConanFile): url = "https://github.com/AnotherFoxGuy/conan-OGRE" description = "scene-oriented, flexible 3D engine written in C++" settings = "os", "compiler", "build_type", "arch" - generators = "cmake_paths", "cmake_find_package" + generators = "cmake_find_package" exports_sources = "patches/**" def requirements(self): diff --git a/ogre/13/patches/13.0.0/AddLibPNG.patch b/ogre/13/patches/13.0.0/AddLibPNG.patch deleted file mode 100644 index d6c757b..0000000 --- a/ogre/13/patches/13.0.0/AddLibPNG.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Components/Overlay/CMakeLists.txt -+++ Components/Overlay/CMakeLists.txt -@@ -7,6 +7,21 @@ - # free to make use of it in any way you like. - #------------------------------------------------------------------- - -+ -+# FreeType from conan has seperate libraries -+find_package(PNG) -+find_package(BZip2) -+ -+find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) -+find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) -+ -+if(NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLICOMMON_LIBRARY-NOTFOUND" AND NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLIDEC_LIBRARY-NOTFOUND") -+ set(BROTLI_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}) -+ message(STATUS "Brotli libraries found: ${BROTLI_LIBRARIES}") -+else() -+ message(WARNING "Brotli library not found: ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}") -+endif() -+ - ############################################################ - # Overlay optional component - ############################################################ -@@ -52,7 +67,7 @@ - - if(FREETYPE_FOUND) - target_compile_definitions(OgreOverlay PRIVATE HAVE_FREETYPE) -- target_link_libraries(OgreOverlay PRIVATE ${FREETYPE_LIBRARIES}) -+ target_link_libraries(OgreOverlay PRIVATE ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB) - target_include_directories(OgreOverlay PRIVATE ${FREETYPE_INCLUDE_DIRS}) - elseif(UNIX) - set_source_files_properties(src/OgreFont.cpp PROPERTIES diff --git a/ogre/13/patches/13.0.0/CMakeLists.txt.patch b/ogre/13/patches/13.0.0/CMakeLists.txt.patch index aa3d8e2..99fc08d 100644 --- a/ogre/13/patches/13.0.0/CMakeLists.txt.patch +++ b/ogre/13/patches/13.0.0/CMakeLists.txt.patch @@ -1,19 +1,10 @@ --- CMakeLists.txt +++ CMakeLists.txt -@@ -20,6 +20,8 @@ - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) +@@ -71,6 +71,7 @@ -+include(${CMAKE_BINARY_DIR}/conan_paths.cmake) -+ - if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android") - set(CMAKE_LINK_LIBRARY_FLAG "") - endif() -@@ -74,6 +76,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" -+ "${CMAKE_BINARY_DIR}" - ) - - include(CMakeDependentOption) + "${PROJECT_SOURCE_DIR}/CMake/Packages" \ No newline at end of file diff --git a/ogre/13/patches/13.0.0/Dependencies.cmake.patch b/ogre/13/patches/13.0.0/Dependencies.cmake.patch deleted file mode 100644 index 1c928e8..0000000 --- a/ogre/13/patches/13.0.0/Dependencies.cmake.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CMake/Dependencies.cmake -+++ CMake/Dependencies.cmake -@@ -13,7 +13,7 @@ - - # OGRE_DEPENDENCIES_DIR can be used to specify a single base - # folder where the required dependencies may be found. --set(OGRE_DEPENDENCIES_DIR "${PROJECT_BINARY_DIR}/Dependencies" CACHE PATH "Path to prebuilt OGRE dependencies") -+set(OGRE_DEPENDENCIES_DIR ${CMAKE_PREFIX_PATH}) - option(OGRE_BUILD_DEPENDENCIES "automatically build Ogre Dependencies (SDL2, pugixml)" TRUE) - - message(STATUS "DEPENDENCIES_DIR: ${OGRE_DEPENDENCIES_DIR}") -@@ -68,7 +68,7 @@ - set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${OGRE_DEP_SEARCH_PATH}) - set(CMAKE_FRAMEWORK_PATH ${CMAKE_FRAMEWORK_PATH} ${OGRE_DEP_SEARCH_PATH}) - --if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) -+if(0) - message(STATUS "Building pugixml") - file(DOWNLOAD - https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz \ No newline at end of file diff --git a/ogre/13/patches/13.0.1/CMakeLists.txt.patch b/ogre/13/patches/13.0.1/CMakeLists.txt.patch new file mode 100644 index 0000000..9a81751 --- /dev/null +++ b/ogre/13/patches/13.0.1/CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -71,6 +71,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.0.1/FindPkgMacros.cmake.patch b/ogre/13/patches/13.0.1/FindPkgMacros.cmake.patch new file mode 100644 index 0000000..6d62fc4 --- /dev/null +++ b/ogre/13/patches/13.0.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.0.1/FixFindOpenGLES2.cmake.patch b/ogre/13/patches/13.0.1/FixFindOpenGLES2.cmake.patch new file mode 100644 index 0000000..9986338 --- /dev/null +++ b/ogre/13/patches/13.0.1/FixFindOpenGLES2.cmake.patch @@ -0,0 +1,11 @@ +--- CMake/Packages/FindOpenGLES2.cmake ++++ CMake/Packages/FindOpenGLES2.cmake +@@ -23,6 +23,8 @@ + # EGL_INCLUDE_DIR - the EGL include directory + # EGL_LIBRARIES - Link these to use EGL + ++include(FindPkgMacros) ++ + IF(APPLE) + create_search_paths(/Developer/Platforms) + findpkg_framework(OpenGLES2) diff --git a/ogre/13/patches/13.0.1/pugixml-fix.patch b/ogre/13/patches/13.0.1/pugixml-fix.patch new file mode 100644 index 0000000..b132061 --- /dev/null +++ b/ogre/13/patches/13.0.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)