Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ogre: migrate to Conan v2, bump to latest version #21073

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d781d9d
ogre: migrate to Conan v2, bump to latest version
valgur Nov 10, 2023
31b90f8
ogre: disable freeimage plugin for now
valgur Apr 20, 2024
bafc00c
ogre: fix rmdir lib/cmake/OGRE
valgur Jul 15, 2024
2169b78
Merge remote-tracking branch 'upstream/master' into migrate/ogre
valgur Sep 9, 2024
2b10bf9
ogre: bump patch version
valgur Sep 9, 2024
9dcc192
ogre: bump deps
valgur Sep 9, 2024
2d4ca40
ogre: add DirectX system lib deps
valgur Sep 9, 2024
7752266
ogre: libglvnd -> opengl
valgur Sep 19, 2024
180a44a
ogre: drop some excessive options
valgur Sep 19, 2024
0125d46
ogre: fix target names, package paths, static build, drop test_v1_pac…
valgur Sep 19, 2024
30fe00f
ogre: improve option descriptions
valgur Sep 19, 2024
ea729c8
ogre: add glslang support
valgur Sep 19, 2024
e6c6815
ogre: add RenderSystem_Vulkan support
valgur Sep 19, 2024
9d04741
ogre: add OpenMP support to RenderSystem_Tiny
valgur Sep 19, 2024
a654bee
ogre: unvendor stb
valgur Sep 19, 2024
5597eee
Merge remote-tracking branch 'upstream/master' into migrate/ogre
valgur Sep 19, 2024
c74dc20
ogre: fix build_component_bites support
valgur Sep 19, 2024
f90f50e
ogre: unvendor imgui
valgur Sep 19, 2024
23f242c
ogre: disable imgui for now
valgur Sep 23, 2024
cf16f57
ogre: disable OGRE_ENABLE_PRECOMPILED_HEADERS
valgur Sep 23, 2024
27e82d5
ogre: fix disabling of imgui
valgur Sep 23, 2024
c4293da
ogre: enable GLES2 by default only on embedded systems
valgur Sep 23, 2024
98faa3e
ogre: bump to v14.3.0
valgur Sep 23, 2024
8329249
ogre: add EGL and Wayland support
valgur Sep 23, 2024
7469612
ogre: don't package Find*.cmake modules
valgur Sep 23, 2024
ac3fd39
ogre: bump imgui
valgur Sep 24, 2024
3b04f8c
ogre: handle exceptions in includedir paths
valgur Sep 24, 2024
41e0be5
ogre: set cmake_target_name for glslang components
valgur Sep 24, 2024
ccd6d66
Merge remote-tracking branch 'upstream/master' into migrate/ogre
valgur Oct 12, 2024
98dcaa0
ogre: bump deps
valgur Oct 12, 2024
ac8d254
ogre: DirectX 9 is not available on C3I
valgur Oct 12, 2024
15ec300
ogre: make xorg components more specific
valgur Oct 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 69 additions & 5 deletions recipes/ogre/1.x/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,71 @@
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)
macro(custom_find_package name)
find_package(${name} ${ARGN})
string(TOUPPER ${name} name_upper)
set(${name_upper}_FOUND TRUE)
set(${name_upper}_VERSION_STRING ${${name}_VERSION_STRING})
set(${name_upper}_INCLUDE_DIRS ${${name}_INCLUDE_DIRS})
set(${name_upper}_INCLUDE_DIR ${${name}_INCLUDE_DIR})
set(${name_upper}_LIBRARIES ${${name}_LIBRARIES})
set(${name_upper}_DEFINITIONS ${${name}_DEFINITIONS})
unset(name_upper)
endmacro()

add_subdirectory(source_subfolder)
# 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)

custom_find_package(FreeImage QUIET CONFIG)
custom_find_package(Freetype QUIET CONFIG)
custom_find_package(OpenEXR QUIET CONFIG)
custom_find_package(assimp QUIET CONFIG)
custom_find_package(pugixml REQUIRED CONFIG)

if(OGRE_BUILD_RENDERSYSTEM_GL OR OGRE_BUILD_RENDERSYSTEM_GL3PLUS OR OGRE_BUILD_RENDERSYSTEM_GLES2)
find_package(khrplatform REQUIRED CONFIG)
link_libraries(khrplatform::khrplatform)
find_package(glad REQUIRED CONFIG)
link_libraries(glad::glad)
endif()

if(OGRE_BUILD_PLUGIN_GLSLANG)
# https://github.com/OGRECave/ogre/blob/v14.2.6/PlugIns/GLSLang/CMakeLists.txt#L22-L35
find_package(glslang REQUIRED CONFIG)
find_package(SPIRV-Tools REQUIRED CONFIG)
endif()

add_subdirectory(src)

if(TARGET OgreOverlay AND OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
find_package(imgui REQUIRED CONFIG)
target_sources(OgreOverlay PRIVATE ${CONAN_IMGUI_SRC}/misc/freetype/imgui_freetype.cpp)
target_include_directories(OgreOverlay PRIVATE ${CONAN_IMGUI_SRC}/misc/freetype)
target_link_libraries(OgreOverlay PUBLIC imgui::imgui)
endif()
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 Codec_STBI)
find_package(stb REQUIRED CONFIG)
target_link_libraries(Codec_STBI PRIVATE stb::stb)
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()
if(TARGET RenderSystem_Vulkan)
find_package(VulkanHeaders REQUIRED CONFIG)
find_package(volk REQUIRED CONFIG)
target_link_libraries(RenderSystem_Vulkan PUBLIC Vulkan::Headers volk::volk)
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"
"14.3.0":
url: "https://github.com/OGRECave/ogre/archive/refs/tags/v14.3.0.tar.gz"
sha256: "40c20797f4c21bae0d80df7ffd6fe92af26c0cdd666c2db4f005da02dfcc4d5b"
Loading
Loading