Merge branch 'master' into warm_up

Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp

.github/workflows/linux.build.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Linux CI
 
 # Controls when the action will run.
 on:
@@ -16,15 +16,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run Linux C++11
         working-directory: ./
         run: ./Scripts/BuildScripts/build_ci_linux.sh
       - name: ABI Checker Report Generation
         if: ${{ (github.ref != 'refs/heads/master' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'master') }}
         run: ./Scripts/BuildScripts/abi_checker.sh 2 $GITHUB_BASE_REF
       - name: ABI Checker Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ (github.ref != 'refs/heads/master' && github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'master') }}
         with:
           name: abi-checker-reports

.github/workflows/main.yml

@@ -1,21 +1,12 @@
-name: CI
+name: Doxygen
 
 # Controls when the action will run.
 on:
   push:
     branches:  'master'
 
-  # Run for all pull requests
-  pull_request:
-    branches: '*'
-    types: [opened]
-
 env:
-  CMAKE_DOXYGEN_INPUT_LIST: "Components Docs/src OgreMain PlugIns RenderSystems"
-  OGRE_SOURCE_DIR: "./"
-  OGRE_BINARY_DIR: "./"
   OGRE_VERSION: "latest"
-  DOXYGEN_HTML_OUTPUT_DIR: "./latest"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -24,27 +15,13 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v1
-
-      - name: Generate Doxyfile
-        # Replace CMake's ${ENV_VAR} to Doxygen's $(ENV_VAR) syntax
-        run: cat CMake/Templates/html.cfg.in | sed 's/\${\(.*\)}/$(\1)/' > Doxyfile
-
-      - name: Generate docs with doxygen
-        uses: mattnotmitt/doxygen-action@v1
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
-          doxyfile-path: './Doxyfile'
+          ref: gh-pages
+          path: gh-pages
 
-      - name: Remove files
-        working-directory: .github/workflows/
-        run: python3 doxygen_remove_files.py
-
-      - name: Publish # Only on master branch
-        if: github.ref == 'refs/heads/master'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./
-          keep_files: true
+      - name: Build Doxygen
+        working-directory: ./
+        run: ./Scripts/BuildScripts/build_ci_doxygen.sh

CMake/Packages/FindOGRE.cmake

@@ -173,8 +173,9 @@ set(OGRE_PREFIX_WATCH ${OGRE_PREFIX_PATH} ${OGRE_PREFIX_SOURCE} ${OGRE_PREFIX_BU
 clear_if_changed(OGRE_PREFIX_WATCH ${OGRE_RESET_VARS})
 
 if(NOT OGRE_STATIC)
-	# try to locate Ogre via pkg-config
-	use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
+    # try to locate Ogre via pkg-config
+    use_pkgconfig(OGRE_PKGC "OGRE-Next${OGRE_LIB_SUFFIX}")
+    use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
 
 	# Set the framework search path for OS X
     set(OGRE_FRAMEWORK_SEARCH_PATH
@@ -396,7 +397,7 @@ set(OGRE_COMPONENT_SEARCH_PATH_DBG
 macro(ogre_find_component COMPONENT HEADER PATH_HINTS)
   set(OGRE_${COMPONENT}_FIND_QUIETLY ${OGRE_FIND_QUIETLY})
   findpkg_begin(OGRE_${COMPONENT})
-  find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${PATH_HINTS} ${COMPONENT} OGRE/${COMPONENT} )
+  find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${PATH_HINTS} ${COMPONENT} OGRE-Next/${COMPONENT} OGRE/${COMPONENT} )
   set(OGRE_${COMPONENT}_LIBRARY_NAMES "OgreNext${COMPONENT}${OGRE_LIB_SUFFIX}" "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}")
   get_debug_names(OGRE_${COMPONENT}_LIBRARY_NAMES)
   find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")

CMake/Templates/OGREStatic.pc.in

@@ -2,12 +2,12 @@ prefix=@OGRE_PREFIX_PATH@
 exec_prefix=${prefix}
 libdir=${prefix}/@OGRE_LIB_DIRECTORY@
 includedir=${prefix}/include
-plugindir=${libdir}/OGRE
+plugindir=${libdir}/@OGRE_NEXT_PREFIX@
 
-Name: OGRE (static lib)
+Name: @OGRE_NEXT_PREFIX@ (static lib)
 Description: Object-Oriented Graphics Rendering Engine
 Version: @OGRE_VERSION@
 URL: http://www.ogre3d.org
 Requires: freetype2, zziplib, x11, xt, xaw7, gl
-Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@
-Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@
+Libs: -L${libdir} -L${plugindir} -l@OGRE_NEXT@Main@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@
+Cflags: -I${includedir} -I${includedir}/@OGRE_NEXT_PREFIX@ @OGRE_CFLAGS@

CMake/Templates/SDK_CMakeLists.txt.in

@@ -11,16 +11,10 @@
 # OGRE SAMPLES BUILD SYSTEM
 ######################################################################
 
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 3.5.1)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 cmake_policy(SET CMP0003 NEW)
 
-# CMake 2.8.2 has a bug that creates unusable Xcode projects when using ARCHS_STANDARD_32_BIT
-# to specify both armv6 and armv7.
-if(OGRE_BUILD_PLATFORM_APPLE_IOS AND (CMAKE_VERSION VERSION_EQUAL 2.8.2) AND (CMAKE_GENERATOR STREQUAL "Xcode"))
-	message(FATAL_ERROR "CMake 2.8.2 cannot create compatible Xcode projects for iOS, please download the latest version or an older release from http://www.cmake.org/files/")
-endif()
-
 # Just debug / release since that's all that's included in SDK. Only release for iOS/OS X
 if(APPLE)
   set (CMAKE_CONFIGURATION_TYPES "Release" CACHE STRING "" FORCE)