🎉 Added OGRE 13.2

This commit is contained in:
2021-11-28 16:48:49 +00:00
parent 8c2d339585
commit 23b026d664
14 changed files with 36 additions and 93 deletions

View File

@ -1,10 +0,0 @@
--- 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"

View File

@ -1,11 +0,0 @@
--- 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)

View File

@ -1,11 +0,0 @@
--- 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

@ -1,11 +0,0 @@
--- 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)

View File

@ -1,15 +0,0 @@
--- 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

@ -1,6 +1,6 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -71,6 +71,7 @@
@@ -76,6 +76,7 @@
# Include necessary submodules
set(CMAKE_MODULE_PATH