Skip to content

Commit

Permalink
ogre: migrate to Conan v2
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Nov 11, 2023
1 parent 1f2e469 commit 2477eb1
Show file tree
Hide file tree
Showing 10 changed files with 641 additions and 859 deletions.
36 changes: 31 additions & 5 deletions recipes/ogre/1.x/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,33 @@
cmake_minimum_required(VERSION 3.10.2)
project(cmake_wrapper)
cmake_minimum_required(VERSION 3.15)
project(OGRE)

include(conanbuildinfo.cmake)
conan_basic_setup(TARGETS)
# Do not allow system Qt to be used by accident
set(CMAKE_DISABLE_FIND_PACKAGE_QT TRUE)
set(CMAKE_DISABLE_FIND_PACKAGE_Qt5 TRUE)
set(CMAKE_DISABLE_FIND_PACKAGE_Qt6 TRUE)

add_subdirectory(source_subfolder)
find_package(pugixml REQUIRED CONFIG)
find_package(FreeImage QUIET CONFIG)
find_package(OPENEXR QUIET CONFIG)
find_package(FREETYPE QUIET CONFIG)
find_package(assimp QUIET CONFIG)

add_library(pugixml ALIAS pugixml::pugixml)

add_subdirectory(src)

if(TARGET Codec_FreeImage)
target_link_libraries(Codec_FreeImage PUBLIC freeimage::freeimage)
endif()
if(TARGET Codec_EXR)
target_link_libraries(Codec_EXR openexr::openexr)
endif()
if(TARGET OgreOverlay)
target_link_libraries(OgreOverlay PUBLIC Freetype::Freetype)
endif()
if(TARGET Plugin_DotScene)
target_link_libraries(Plugin_DotScene PUBLIC pugixml::pugixml)
endif()
if(TARGET OgreXMLConverter)
target_link_libraries(OgreXMLConverter pugixml::pugixml)
endif()
10 changes: 3 additions & 7 deletions recipes/ogre/1.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
sources:
"1.10.2":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v1.10.2.tar.gz"
sha256: "db022c682376ace2abc45b42802048ad3a8458f5052cbc180b5fb470e4f06a53"
patches:
"1.10.2":
- base_path: "source_subfolder"
patch_file: "patches/0001-ogre-1.10.2-cmake-fixes.patch"
"1.12.13":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v1.12.13.tar.gz"
sha256: "b01ec30e7866b3140fc487eb828d92968d6aadc86254ad761a6bcac0f8b8a27f"
836 changes: 550 additions & 286 deletions recipes/ogre/1.x/conanfile.py

Large diffs are not rendered by default.

Loading

0 comments on commit 2477eb1

Please sign in to comment.