diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 10398d2..c01f323 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,13 +24,9 @@ jobs: DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 SHORT_CONFIG: linux_ppc64le_ timeoutInMinutes: 360 + variables: {} steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -41,6 +37,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a550455..791ec4d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,11 +17,15 @@ jobs: UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_arm64_ timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 44f93bc..8be5906 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -18,6 +18,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -36,35 +37,20 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - script: | set CI=azure set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) @@ -91,24 +77,4 @@ jobs: condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) inputs: targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4614fbe..df30752 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -21,5 +25,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index bed8836..be5ca81 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -25,5 +29,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 149a216..5632b2b 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -21,5 +25,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6494b74..a97eef8 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,11 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.9' channel_sources: - conda-forge channel_targets: @@ -13,7 +17,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 90d7fae..5e7d0e4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,11 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,7 +15,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' freetype: - '2' macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 2ce63e3..44772bf 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -67,9 +68,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -91,6 +97,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -55,11 +61,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,9 +76,15 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..6d54697 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,125 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index a4f5271..8103ba2 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/recipe/0001-Add-option-to-force-pkg-config-on-Windows.patch b/recipe/0001-Add-option-to-force-pkg-config-on-Windows.patch new file mode 100644 index 0000000..08fe9a3 --- /dev/null +++ b/recipe/0001-Add-option-to-force-pkg-config-on-Windows.patch @@ -0,0 +1,77 @@ +From f17f54eb4ff4d67ca84041fd8e030eb18ef07204 Mon Sep 17 00:00:00 2001 +From: Michael Carroll +Date: Tue, 23 Aug 2022 15:20:37 -0500 +Subject: [PATCH 1/2] Add option to force pkg-config on Windows + +Signed-off-by: Michael Carroll +--- + CMake/ConfigureBuild.cmake | 16 +++++++++++++++- + CMake/Templates/OGRE.pc.in | 2 +- + CMakeLists.txt | 2 +- + 3 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +index 9d3b1b27d7..05e3cca52e 100644 +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -253,9 +253,17 @@ install( FILES + DESTINATION include/${OGRE_NEXT_PREFIX} + ) + ++if (UNIX) ++ # Always generate package config files on Unix systems ++ set(OGRE_GENERATE_PKGCONFIG TRUE) ++else() ++ # For Windows, check for opt-in configuration of pkg-config ++ set(OGRE_GENERATE_PKGCONFIG ${OGRE_CONFIG_GENERATE_PKGCONFIG}) ++endif() ++ + + # Create the pkg-config package files on Unix systems +-if (UNIX) ++if (OGRE_GENERATE_PKGCONFIG) + set(OGRE_LIB_SUFFIX "") + set(OGRE_PLUGIN_PREFIX "") + set(OGRE_PLUGIN_EXT ".so") +@@ -269,6 +277,12 @@ if (UNIX) + set(OGRE_LIB_SUFFIX "${OGRE_LIB_SUFFIX}_d") + endif () + ++ if (WIN32) ++ set(OGRE_PLUGIN_DIRECTORY bin) ++ else() ++ set(OGRE_PLUGIN_DIRECTORY ${OGRE_LIB_DIRECTORY}) ++ endif() ++ + set(OGRE_ADDITIONAL_LIBS "") + set(OGRE_CFLAGS "") + set(OGRE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}) +diff --git a/CMake/Templates/OGRE.pc.in b/CMake/Templates/OGRE.pc.in +index ce726134a9..aea9ea4bb2 100644 +--- a/CMake/Templates/OGRE.pc.in ++++ b/CMake/Templates/OGRE.pc.in +@@ -2,7 +2,7 @@ prefix=@OGRE_PREFIX_PATH@ + exec_prefix=${prefix} + libdir=${prefix}/@OGRE_LIB_DIRECTORY@ + includedir=${prefix}/include +-plugindir=${libdir}/@OGRE_NEXT_PREFIX@ ++plugindir=${prefix}/@OGRE_PLUGIN_DIRECTORY@/@OGRE_NEXT_PREFIX@ + + Name: @OGRE_NEXT_PREFIX@ + Description: Object-Oriented Graphics Rendering Engine +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36a202b0a2..671272b173 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -478,7 +478,7 @@ option(OGRE_BUILD_TESTS "Build the unit tests & PlayPen" FALSE) + option(OGRE_CONFIG_DOUBLE "Use doubles instead of floats in Ogre" FALSE) + option(OGRE_CONFIG_NODE_INHERIT_TRANSFORM "Tells the node whether it should inherit full transform from it's parent node or derived position, orientation and scale" FALSE) + +- ++option(OGRE_CONFIG_GENERATE_PKGCONFIG "Force pkg-config generation on non-Unix platforms" FALSE) + set(OGRE_PLUGIN_LIB_PREFIX "" CACHE STRING "Prefix dynamically linked plugins, e.g. 'lib' (GCC and Clang only)") + + if (WINDOWS_STORE OR WINDOWS_PHONE) +-- +2.34.1 + diff --git a/recipe/0002-Include-suffix-in-binary-install-paths-on-Windows.patch b/recipe/0002-Include-suffix-in-binary-install-paths-on-Windows.patch new file mode 100644 index 0000000..fa12fa1 --- /dev/null +++ b/recipe/0002-Include-suffix-in-binary-install-paths-on-Windows.patch @@ -0,0 +1,103 @@ +From a6ecf49c0ddaac1ab92b47242952451cbf0a4e5b Mon Sep 17 00:00:00 2001 +From: Michael Carroll +Date: Tue, 23 Aug 2022 15:21:14 -0500 +Subject: [PATCH 2/2] Include suffix in binary install paths on Windows + +Signed-off-by: Michael Carroll +--- + CMake/Utils/OgreConfigTargets.cmake | 53 +++++++++++------------------ + 1 file changed, 20 insertions(+), 33 deletions(-) + +diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake +index d8e020860a..42757e93a5 100644 +--- a/CMake/Utils/OgreConfigTargets.cmake ++++ b/CMake/Utils/OgreConfigTargets.cmake +@@ -41,36 +41,23 @@ if (NOT OGRE_RUNTIME_OUTPUT) + set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin) + endif () + +-if (WIN32) +- set(OGRE_RELEASE_PATH "/Release") +- set(OGRE_RELWDBG_PATH "/RelWithDebInfo") +- set(OGRE_MINSIZE_PATH "/MinSizeRel") +- set(OGRE_DEBUG_PATH "/Debug") ++set(OGRE_RELEASE_PATH "") ++set(OGRE_RELWDBG_PATH "") ++set(OGRE_MINSIZE_PATH "") ++set(OGRE_DEBUG_PATH "") ++set(OGRE_LIB_RELEASE_PATH "") ++set(OGRE_LIB_RELWDBG_PATH "") ++set(OGRE_LIB_MINSIZE_PATH "") ++set(OGRE_LIB_DEBUG_PATH "") ++if(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) + set(OGRE_LIB_RELEASE_PATH "/Release") +- set(OGRE_LIB_RELWDBG_PATH "/RelWithDebInfo") +- set(OGRE_LIB_MINSIZE_PATH "/MinSizeRel") +- set(OGRE_LIB_DEBUG_PATH "/Debug") +- set(OGRE_PLUGIN_PATH "/opt") +- set(OGRE_SAMPLE_PATH "/opt/samples") +-elseif (UNIX) +- set(OGRE_RELEASE_PATH "") +- set(OGRE_RELWDBG_PATH "") +- set(OGRE_MINSIZE_PATH "") +- set(OGRE_DEBUG_PATH "") +- set(OGRE_LIB_RELEASE_PATH "") +- set(OGRE_LIB_RELWDBG_PATH "") +- set(OGRE_LIB_MINSIZE_PATH "") +- set(OGRE_LIB_DEBUG_PATH "") +- if(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) +- set(OGRE_LIB_RELEASE_PATH "/Release") +- endif(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) +- if (APPLE) +- set(OGRE_PLUGIN_PATH "/") +- else() +- set(OGRE_PLUGIN_PATH "/${OGRE_NEXT_PREFIX}") +- endif(APPLE) +- set(OGRE_SAMPLE_PATH "/${OGRE_NEXT_PREFIX}/Samples") +-endif () ++endif(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) ++if (APPLE) ++ set(OGRE_PLUGIN_PATH "/${OGRE_NEXT_PREFIX}") ++else() ++ set(OGRE_PLUGIN_PATH "/${OGRE_NEXT_PREFIX}") ++endif(APPLE) ++set(OGRE_SAMPLE_PATH "/${OGRE_NEXT_PREFIX}/Samples") + + # create vcproj.user file for Visual Studio to set debug working directory + function(ogre_create_vcproj_userfile TARGETNAME) +@@ -130,28 +117,28 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT) + else() + install(TARGETS ${TARGETNAME} + BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" +- RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" ++ RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release" CONFIGURATIONS Release None "" + ) + install(TARGETS ${TARGETNAME} + BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo +- RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo ++ RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELWDBG_PATH}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo + ) + install(TARGETS ${TARGETNAME} + BUNDLE DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel +- RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel ++ RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_MINSIZE_PATH}/MinSizeRel" CONFIGURATIONS MinSizeRel + ) + install(TARGETS ${TARGETNAME} + BUNDLE DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug +- RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug ++ RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_DEBUG_PATH}/Debug" CONFIGURATIONS Debug +-- +2.34.1 + diff --git a/recipe/388.patch b/recipe/388.patch deleted file mode 100644 index 62a2406..0000000 --- a/recipe/388.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/RenderSystems/GL3Plus/src/OgreGL3PlusTextureGpu.cpp b/RenderSystems/GL3Plus/src/OgreGL3PlusTextureGpu.cpp -index c9a1147b188..87731a18fdd 100644 ---- a/RenderSystems/GL3Plus/src/OgreGL3PlusTextureGpu.cpp -+++ b/RenderSystems/GL3Plus/src/OgreGL3PlusTextureGpu.cpp -@@ -649,15 +649,23 @@ namespace Ogre - dstBox.getZOrSlice() + dstGl->getInternalSliceStart(), - srcBox.width, srcBox.height, srcBox.getDepthOrSlices() ) ); - } -- /*TODO - else if( support.checkExtension( "GL_NV_copy_image" ) ) - { -- OCGE( glCopyImageSubDataNV( this->mFinalTextureName, this->mGlTextureTarget, -- srcMipLevel, srcBox.x, srcBox.y, srcBox.z, -- dstGl->mFinalTextureName, dstGl->mGlTextureTarget, -- dstMipLevel, dstBox.x, dstBox.y, dstBox.z, -- srcBox.width, srcBox.height, srcBox.getDepthOrSlices() ) ); -- }*/ -+ // Initialize the pointer only the first time -+ PFNGLCOPYIMAGESUBDATANVPROC local_glCopyImageSubDataNV = nullptr; -+ if (!local_glCopyImageSubDataNV) -+ { -+ local_glCopyImageSubDataNV = (PFNGLCOPYIMAGESUBDATANVPROC)gl3wGetProcAddress("glCopyImageSubDataNV"); -+ } -+ -+ OCGE( local_glCopyImageSubDataNV( this->mFinalTextureName, this->mGlTextureTarget, -+ srcMipLevel, srcBox.x, srcBox.y, -+ srcBox.getZOrSlice() + this->getInternalSliceStart(), -+ dstGl->mFinalTextureName, dstGl->mGlTextureTarget, -+ dstMipLevel, dstBox.x, dstBox.y, -+ dstBox.getZOrSlice() + dstGl->getInternalSliceStart(), -+ srcBox.width, srcBox.height, srcBox.getDepthOrSlices() ) ); -+ } - /*TODO: These are for OpenGL ES 3.0+ - else if( support.checkExtension( "GL_OES_copy_image" ) ) - { diff --git a/recipe/add_OGRE_USE_NEW_PROJECT_NAME_cmake_option.patch b/recipe/add_OGRE_USE_NEW_PROJECT_NAME_cmake_option.patch deleted file mode 100644 index f1943c2..0000000 --- a/recipe/add_OGRE_USE_NEW_PROJECT_NAME_cmake_option.patch +++ /dev/null @@ -1,868 +0,0 @@ -From 69c4f6cb01ef2a68d067ea102a4d658f06184d07 Mon Sep 17 00:00:00 2001 -From: "Matias N. Goldberg" -Date: Sat, 2 Apr 2022 15:14:18 -0300 -Subject: [PATCH] Add OGRE_USE_NEW_PROJECT_NAME CMake option - -When enabled, all projects and libraries will be named "OgreNext" -instead of Ogre. ---- - CMake/Packages/FindOGRE.cmake | 41 +++--- - CMake/Utils/AndroidMacros.cmake | 6 +- - CMakeLists.txt | 20 ++- - Components/Hlms/Pbs/CMakeLists.txt | 14 +- - Components/Hlms/Unlit/CMakeLists.txt | 12 +- - Components/MeshLodGenerator/CMakeLists.txt | 14 +- - Components/Overlay/CMakeLists.txt | 14 +- - Components/PlanarReflections/CMakeLists.txt | 12 +- - Components/SceneFormat/CMakeLists.txt | 12 +- - OgreMain/CMakeLists.txt | 36 +++--- - PlugIns/ParticleFX/CMakeLists.txt | 2 +- - RenderSystems/Direct3D11/CMakeLists.txt | 2 +- - RenderSystems/GL3Plus/CMakeLists.txt | 2 +- - RenderSystems/Metal/CMakeLists.txt | 4 +- - RenderSystems/NULL/CMakeLists.txt | 2 +- - RenderSystems/Vulkan/CMakeLists.txt | 2 +- - .../2.0/ApiUsage/SceneFormat/CMakeLists.txt | 2 +- - Samples/2.0/CMakeLists.txt | 2 +- - Samples/2.0/Common/CMakeLists.txt | 2 +- - .../CMake/Dependencies/OGRE.cmake | 120 ++++++++++++++---- - .../2.0/Tutorials/EmptyProject/CMakeLists.txt | 2 + - .../Tutorials/Tutorial_Memory/CMakeLists.txt | 2 +- - .../Tutorials/Tutorial_Terrain/CMakeLists.txt | 2 +- - Tests/CMakeLists.txt | 2 +- - 24 files changed, 212 insertions(+), 117 deletions(-) - -diff --git a/CMake/Packages/FindOGRE.cmake b/CMake/Packages/FindOGRE.cmake -index 2b8f20df630..54635572e42 100644 ---- a/CMake/Packages/FindOGRE.cmake -+++ b/CMake/Packages/FindOGRE.cmake -@@ -25,11 +25,11 @@ - # - # Additionally this script searches for the following optional - # parts of the Ogre package: --# Plugin_CgProgramManager, Plugin_ParticleFX, --# RenderSystem_GL, RenderSystem_GL3Plus, --# RenderSystem_GLES, RenderSystem_GLES2, --# RenderSystem_Direct3D9, RenderSystem_Direct3D11 --# Paging, Terrain, Volume, Overlay -+# Plugin_ParticleFX, -+# RenderSystem_GL3Plus, -+# RenderSystem_GLES2, -+# RenderSystem_Direct3D11 -+# Paging, Volume, Overlay - # - # For each of these components, the following variables are defined: - # -@@ -69,9 +69,9 @@ else () - endif () - - if(APPLE AND NOT OGRE_STATIC) -- set(OGRE_LIBRARY_NAMES "Ogre${OGRE_LIB_SUFFIX}") -+ set(OGRE_LIBRARY_NAMES "OgreNext${OGRE_LIB_SUFFIX}" "Ogre${OGRE_LIB_SUFFIX}") - else() -- set(OGRE_LIBRARY_NAMES "OgreMain${OGRE_LIB_SUFFIX}") -+ set(OGRE_LIBRARY_NAMES "OgreNextMain${OGRE_LIB_SUFFIX}" "OgreMain${OGRE_LIB_SUFFIX}") - endif() - get_debug_names(OGRE_LIBRARY_NAMES) - -@@ -79,11 +79,21 @@ get_debug_names(OGRE_LIBRARY_NAMES) - # OS specific guesses - if (WIN32) - set(OGRE_PREFIX_GUESSES -+ ${ENV_PROGRAMFILES}/OGRE-Next -+ C:/OgreNextSDK - ${ENV_PROGRAMFILES}/OGRE - C:/OgreSDK - ) - elseif (UNIX) - set(OGRE_PREFIX_GUESSES -+ /opt/ogre-next -+ /opt/OGRE-Next -+ /usr/lib${LIB_SUFFIX}/ogre-next -+ /usr/lib${LIB_SUFFIX}/OGRE-Next -+ /usr/local/lib${LIB_SUFFIX}/ogre-next -+ /usr/local/lib${LIB_SUFFIX}/OGRE-Next -+ $ENV{HOME}/ogre-next -+ $ENV{HOME}/OGRE-Next - /opt/ogre - /opt/OGRE - /usr/lib${LIB_SUFFIX}/ogre -@@ -146,9 +156,9 @@ else() - endif () - - # redo search if any of the environmental hints changed --set(OGRE_COMPONENTS Paging Terrain Volume Overlay -- Plugin_CgProgramManager Plugin_ParticleFX -- RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2) -+set(OGRE_COMPONENTS Paging Volume Overlay -+ Plugin_ParticleFX -+ RenderSystem_Direct3D11 RenderSystem_GL3Plus RenderSystem_GLES2) - set(OGRE_RESET_VARS - OGRE_CONFIG_INCLUDE_DIR OGRE_INCLUDE_DIR - OGRE_FRAMEWORK_INCLUDES OGRE_FRAMEWORK_PATH OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG -@@ -361,9 +371,9 @@ set(OGRE_LIBRARY_DIRS ${OGRE_LIBRARY_DIR_REL} ${OGRE_LIBRARY_DIR_DBG}) - # find binaries - if (NOT OGRE_STATIC) - if (WIN32) -- find_file(OGRE_BINARY_REL NAMES "OgreMain.dll" HINTS ${OGRE_BIN_SEARCH_PATH} -+ find_file(OGRE_BINARY_REL NAMES "OgreNextMain.dll" "OgreMain.dll" HINTS ${OGRE_BIN_SEARCH_PATH} - PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) -- find_file(OGRE_BINARY_DBG NAMES "OgreMain_d.dll" HINTS ${OGRE_BIN_SEARCH_PATH} -+ find_file(OGRE_BINARY_DBG NAMES "OgreNextMain_d.dll" "OgreMain_d.dll" HINTS ${OGRE_BIN_SEARCH_PATH} - PATH_SUFFIXES "" Debug ) - endif() - mark_as_advanced(OGRE_BINARY_REL OGRE_BINARY_DBG) -@@ -389,7 +399,7 @@ 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} ) -- set(OGRE_${COMPONENT}_LIBRARY_NAMES "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}") -+ 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") - find_library(OGRE_${COMPONENT}_LIBRARY_DBG NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIBRARY_DIR_DBG} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Debug") -@@ -399,8 +409,8 @@ macro(ogre_find_component COMPONENT HEADER PATH_HINTS) - # find binaries - if (NOT OGRE_STATIC) - if (WIN32) -- find_file(OGRE_${COMPONENT}_BINARY_REL NAMES "Ogre${COMPONENT}.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_REL} PATH_SUFFIXES "" bin bin/Release bin/RelWithDebInfo bin/MinSizeRel Release) -- find_file(OGRE_${COMPONENT}_BINARY_DBG NAMES "Ogre${COMPONENT}_d.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_DBG} PATH_SUFFIXES "" bin bin/Debug Debug) -+ find_file(OGRE_${COMPONENT}_BINARY_REL NAMES "OgreNext${COMPONENT}.dll" "Ogre${COMPONENT}.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_REL} PATH_SUFFIXES "" bin bin/Release bin/RelWithDebInfo bin/MinSizeRel Release) -+ find_file(OGRE_${COMPONENT}_BINARY_DBG NAMES "OgreNext${COMPONENT}_d.dll" "Ogre${COMPONENT}_d.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_DBG} PATH_SUFFIXES "" bin bin/Debug Debug) - endif() - mark_as_advanced(OGRE_${COMPONENT}_BINARY_REL OGRE_${COMPONENT}_BINARY_DBG) - endif() -@@ -514,7 +524,6 @@ endmacro(ogre_find_plugin) - - ogre_find_plugin(Plugin_CgProgramManager OgreCgProgram.h PlugIns/CgProgramManager/include) - ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include) --ogre_find_plugin(RenderSystem_GL OgreGLRenderSystem.h RenderSystems/GL/include) - ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include) - ogre_find_plugin(RenderSystem_GLES OgreGLESRenderSystem.h RenderSystems/GLES/include) - ogre_find_plugin(RenderSystem_GLES2 OgreGLES2RenderSystem.h RenderSystems/GLES2/include) -diff --git a/CMake/Utils/AndroidMacros.cmake b/CMake/Utils/AndroidMacros.cmake -index ef0fb0a81c3..d1a38803fa7 100644 ---- a/CMake/Utils/AndroidMacros.cmake -+++ b/CMake/Utils/AndroidMacros.cmake -@@ -42,12 +42,10 @@ macro(create_android_proj ANDROID_PROJECT_TARGET) - ################################################################## - - if(OGRE_BUILD_RENDERSYSTEM_GLES2) -- SET(DEPENDENCIES OgreMain RenderSystem_GLES2) -- else() -- SET(DEPENDENCIES OgreMain RenderSystem_GLES) -+ SET(DEPENDENCIES ${OGRE_NEXT}Main RenderSystem_GLES2) - endif() - -- SET(DEPENDENCIES ${DEPENDENCIES} OgreTerrain OgreRTShaderSystem OgreMeshLodGenerator OgreOverlay OgrePaging OgreVolume Plugin_ParticleFX Plugin_OctreeSceneManager) -+ SET(DEPENDENCIES ${DEPENDENCIES} ${OGRE_NEXT}MeshLodGenerator ${OGRE_NEXT}Overlay ${OGRE_NEXT}Paging ${OGRE_NEXT}Volume Plugin_ParticleFX) - add_dependencies(${ANDROID_PROJECT_TARGET} ${DEPENDENCIES}) - set(DEPEND_STATIC_LIBS "") - foreach(DEPENDENCY ${DEPENDENCIES}) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3f7e12c981..214575afee4 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -249,14 +249,24 @@ if (APPLE AND OGRE_BUILD_RENDERSYSTEM_METAL) - endif () - endif (APPLE AND OGRE_BUILD_RENDERSYSTEM_METAL) - -+# This option needs to be set now -+option(OGRE_USE_NEW_PROJECT_NAME -+ "Libraries containing Ogre name will be called OgreNext, e.g. 'OgreNext.dll' instead of 'Ogre.dll'" -+ FALSE) -+if( OGRE_USE_NEW_PROJECT_NAME ) -+ set( OGRE_NEXT "OgreNext" ) -+else() -+ set( OGRE_NEXT "Ogre" ) -+endif() -+ - # Find dependencies - include(Dependencies) - # definitions for samples --set(OGRE_LIBRARIES OgreMain) --set(OGRE_MeshLodGenerator_LIBRARIES OgreMeshLodGenerator) --set(OGRE_Paging_LIBRARIES OgrePaging) --set(OGRE_Terrain_LIBRARIES OgreTerrain) --set(OGRE_Volume_LIBRARIES OgreVolume) -+set(OGRE_LIBRARIES ${OGRE_NEXT}Main) -+set(OGRE_MeshLodGenerator_LIBRARIES ${OGRE_NEXT}MeshLodGenerator) -+set(OGRE_Paging_LIBRARIES ${OGRE_NEXT}Paging) -+set(OGRE_Terrain_LIBRARIES ${OGRE_NEXT}Terrain) -+set(OGRE_Volume_LIBRARIES ${OGRE_NEXT}Volume) - - # Specify build paths - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/lib") -diff --git a/Components/Hlms/Pbs/CMakeLists.txt b/Components/Hlms/Pbs/CMakeLists.txt -index be628b88b72..1f0b9c33862 100644 ---- a/Components/Hlms/Pbs/CMakeLists.txt -+++ b/Components/Hlms/Pbs/CMakeLists.txt -@@ -9,7 +9,7 @@ - - # Configure Ogre HLMS Physically Based Shading for OpenGL 3.3+ and D3D11 build - --PROJECT(OgreHlmsPbs) -+PROJECT(${OGRE_NEXT}HlmsPbs) - - file( - GLOB HEADER_FILES -@@ -40,16 +40,16 @@ if( OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS ) - ogre_add_component_include_dir( PlanarReflections ) - endif() - --ogre_add_library(OgreHlmsPbs ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --set_target_properties(OgreHlmsPbs PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreHlmsPbs OgreMain) -+ogre_add_library(${OGRE_NEXT}HlmsPbs ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}HlmsPbs PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}Main) - - if( OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS ) -- target_link_libraries( OgreHlmsPbs OgrePlanarReflections ) -+ target_link_libraries( ${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}PlanarReflections ) - endif() - --ogre_config_framework(OgreHlmsPbs) --ogre_config_component(OgreHlmsPbs) -+ogre_config_framework(${OGRE_NEXT}HlmsPbs) -+ogre_config_component(${OGRE_NEXT}HlmsPbs) - - install (DIRECTORY include/ - DESTINATION include/OGRE/Hlms/Pbs -diff --git a/Components/Hlms/Unlit/CMakeLists.txt b/Components/Hlms/Unlit/CMakeLists.txt -index 0f46fed7b0e..9629fd2ee3d 100644 ---- a/Components/Hlms/Unlit/CMakeLists.txt -+++ b/Components/Hlms/Unlit/CMakeLists.txt -@@ -9,7 +9,7 @@ - - # Configure Ogre HLMS User Interface (2D) for OpenGL 3.3+ and D3D11 build - --PROJECT(OgreHlmsUnlit) -+PROJECT(${OGRE_NEXT}HlmsUnlit) - - file( - GLOB HEADER_FILES -@@ -26,12 +26,12 @@ file( - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Common/include) - --ogre_add_library(OgreHlmsUnlit ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --set_target_properties(OgreHlmsUnlit PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreHlmsUnlit OgreMain) -+ogre_add_library(${OGRE_NEXT}HlmsUnlit ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}HlmsUnlit PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}HlmsUnlit ${OGRE_NEXT}Main) - --ogre_config_framework(OgreHlmsUnlit) --ogre_config_component(OgreHlmsUnlit) -+ogre_config_framework(${OGRE_NEXT}HlmsUnlit) -+ogre_config_component(${OGRE_NEXT}HlmsUnlit) - - install (DIRECTORY include/ - DESTINATION include/OGRE/Hlms/Unlit -diff --git a/Components/MeshLodGenerator/CMakeLists.txt b/Components/MeshLodGenerator/CMakeLists.txt -index 0ad2fe6199b..01e42617237 100644 ---- a/Components/MeshLodGenerator/CMakeLists.txt -+++ b/Components/MeshLodGenerator/CMakeLists.txt -@@ -11,7 +11,7 @@ - # MeshLodGenerator optional component - ############################################################ - --PROJECT(OgreMeshLodGenerator) -+PROJECT(${OGRE_NEXT}MeshLodGenerator) - - # define header and source files for the library - file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") -@@ -25,16 +25,16 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - include_directories(${OGRE_SOURCE_DIR}/OgreMain/include) - - # setup target --ogre_add_library(OgreMeshLodGenerator ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) --set_target_properties(OgreMeshLodGenerator PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreMeshLodGenerator OgreMain) -+ogre_add_library(${OGRE_NEXT}MeshLodGenerator ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}MeshLodGenerator PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}MeshLodGenerator ${OGRE_NEXT}Main) - if (OGRE_CONFIG_THREADS) -- target_link_libraries(OgreMeshLodGenerator ${OGRE_THREAD_LIBRARIES}) -+ target_link_libraries(${OGRE_NEXT}MeshLodGenerator ${OGRE_THREAD_LIBRARIES}) - endif () - - # install --ogre_config_framework(OgreMeshLodGenerator) --ogre_config_component(OgreMeshLodGenerator) -+ogre_config_framework(${OGRE_NEXT}MeshLodGenerator) -+ogre_config_component(${OGRE_NEXT}MeshLodGenerator) - - install(FILES ${HEADER_FILES} - DESTINATION include/OGRE/MeshLodGenerator -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index 372e1be09eb..06f379c27d8 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -11,7 +11,7 @@ - # Overlay optional component - ############################################################ - --PROJECT(OgreOverlay) -+PROJECT(${OGRE_NEXT}Overlay) - - # define header and source files for the library - file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") -@@ -29,16 +29,16 @@ ogre_add_component_include_dir(Hlms/Unlit) - ogre_add_component_include_dir(Hlms/Common) - - # setup target --ogre_add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) --set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreOverlay OgreMain ${FREETYPE_LIBRARIES} OgreHlmsUnlit ) -+ogre_add_library(${OGRE_NEXT}Overlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}Overlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}Overlay ${OGRE_NEXT}Main ${FREETYPE_LIBRARIES} ${OGRE_NEXT}HlmsUnlit ) - if (OGRE_CONFIG_THREADS) -- target_link_libraries(OgreOverlay ${OGRE_THREAD_LIBRARIES}) -+ target_link_libraries(${OGRE_NEXT}Overlay ${OGRE_THREAD_LIBRARIES}) - endif () - - # install --ogre_config_framework(OgreOverlay) --ogre_config_component(OgreOverlay) -+ogre_config_framework(${OGRE_NEXT}Overlay) -+ogre_config_component(${OGRE_NEXT}Overlay) - - install(FILES ${HEADER_FILES} - DESTINATION include/OGRE/Overlay -diff --git a/Components/PlanarReflections/CMakeLists.txt b/Components/PlanarReflections/CMakeLists.txt -index c517bbced43..ec1706518c4 100644 ---- a/Components/PlanarReflections/CMakeLists.txt -+++ b/Components/PlanarReflections/CMakeLists.txt -@@ -8,7 +8,7 @@ - #------------------------------------------------------------------- - - --PROJECT(OgrePlanarReflections) -+PROJECT(${OGRE_NEXT}PlanarReflections) - - file( - GLOB HEADER_FILES -@@ -23,12 +23,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - - add_definitions( -DOgrePlanarReflections_EXPORTS ) - --ogre_add_library(OgrePlanarReflections ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --set_target_properties(OgrePlanarReflections PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgrePlanarReflections OgreMain) -+ogre_add_library(${OGRE_NEXT}PlanarReflections ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}PlanarReflections PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}PlanarReflections ${OGRE_NEXT}Main) - --ogre_config_framework(OgrePlanarReflections) --ogre_config_component(OgrePlanarReflections) -+ogre_config_framework(${OGRE_NEXT}PlanarReflections) -+ogre_config_component(${OGRE_NEXT}PlanarReflections) - - install(FILES ${HEADER_FILES} - DESTINATION include/OGRE/PlanarReflections -diff --git a/Components/SceneFormat/CMakeLists.txt b/Components/SceneFormat/CMakeLists.txt -index 34ea9f85b24..63eec2fd6c1 100644 ---- a/Components/SceneFormat/CMakeLists.txt -+++ b/Components/SceneFormat/CMakeLists.txt -@@ -8,7 +8,7 @@ - #------------------------------------------------------------------- - - --PROJECT(OgreSceneFormat) -+PROJECT(${OGRE_NEXT}SceneFormat) - - file( - GLOB HEADER_FILES -@@ -26,12 +26,12 @@ ogre_add_component_include_dir(Hlms/Pbs) - - add_definitions( -DOgreSceneFormat_EXPORTS ) - --ogre_add_library(OgreSceneFormat ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --set_target_properties(OgreSceneFormat PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreSceneFormat OgreMain OgreHlmsPbs) -+ogre_add_library(${OGRE_NEXT}SceneFormat ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${OGRE_NEXT}SceneFormat PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+target_link_libraries(${OGRE_NEXT}SceneFormat ${OGRE_NEXT}Main ${OGRE_NEXT}HlmsPbs) - --ogre_config_framework(OgreSceneFormat) --ogre_config_component(OgreSceneFormat) -+ogre_config_framework(${OGRE_NEXT}SceneFormat) -+ogre_config_component(${OGRE_NEXT}SceneFormat) - - install(FILES ${HEADER_FILES} - DESTINATION include/OGRE/SceneFormat -diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 866d98126f3..9569d181004 100644 ---- a/OgreMain/CMakeLists.txt -+++ b/OgreMain/CMakeLists.txt -@@ -8,10 +8,10 @@ - #------------------------------------------------------------------- - - ############################################################ --# OgreMain core library -+# OgreNextMain core library - ############################################################ - --PROJECT(OgreMain) -+PROJECT(${OGRE_NEXT}Main) - - function( add_filtered_h filterName fileString ) - file(GLOB TMP_FILES ${fileString}) -@@ -406,19 +406,19 @@ set (TARGET_LINK_FLAGS "") - # setup OgreMain target - if (WINDOWS_STORE OR WINDOWS_PHONE) - # exclude OgreTimer.cpp from unity builds; causes problem -- ogre_add_library(OgreMain ${OGRE_LIB_TYPE} ${PREC_HEADER} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADERS} ${PLATFORM_SOURCE_FILES} ${THREAD_HEADER_FILES} ${THREAD_SOURCE_FILES} SEPARATE "src/WIN32/OgreTimer.cpp") -+ ogre_add_library(${OGRE_NEXT}Main ${OGRE_LIB_TYPE} ${PREC_HEADER} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADERS} ${PLATFORM_SOURCE_FILES} ${THREAD_HEADER_FILES} ${THREAD_SOURCE_FILES} SEPARATE "src/WIN32/OgreTimer.cpp") - else () - # exclude OgreAlignedAllocator.cpp from unity builds; causes problems on Linux -- ogre_add_library(OgreMain ${OGRE_LIB_TYPE} ${PREC_HEADER} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADERS} ${PLATFORM_SOURCE_FILES} ${THREAD_HEADER_FILES} ${THREAD_SOURCE_FILES} SEPARATE "src/OgreAlignedAllocator.cpp") -+ ogre_add_library(${OGRE_NEXT}Main ${OGRE_LIB_TYPE} ${PREC_HEADER} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADERS} ${PLATFORM_SOURCE_FILES} ${THREAD_HEADER_FILES} ${THREAD_SOURCE_FILES} SEPARATE "src/OgreAlignedAllocator.cpp") - endif () - # In visual studio 2010 - 64 bit we get this error: "LINK : fatal error LNK1210: exceeded internal ILK size limit; link with /INCREMENTAL:NO" - if(WIN32 AND MSVC10 AND CMAKE_CL_64) -- set_target_properties(OgreMain PROPERTIES -+ set_target_properties(${OGRE_NEXT}Main PROPERTIES - VERSION ${OGRE_SOVERSION} - LINK_FLAGS "/INCREMENTAL:NO" - ) - else() -- set_target_properties(OgreMain PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) -+ set_target_properties(${OGRE_NEXT}Main PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) - endif() - - if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -@@ -433,15 +433,15 @@ endif() - - if (APPLE) - if (OGRE_BUILD_PLATFORM_APPLE_IOS) -- set_target_properties(OgreMain PROPERTIES INSTALL_NAME_DIR "OGRE") -+ set_target_properties(${OGRE_NEXT}Main PROPERTIES INSTALL_NAME_DIR "OGRE") - else () -- set_target_properties(OgreMain PROPERTIES -+ set_target_properties(${OGRE_NEXT}Main PROPERTIES - LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" - ) - - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") - -- add_custom_command(TARGET OgreMain POST_BUILD -+ add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD - COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading - COMMAND ditto - ${OGRE_SOURCE_DIR}/OgreMain/include/Threading/*.h ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading -@@ -454,7 +454,7 @@ if (APPLE) - foreach(HEADER_PATH ${THREAD_HEADER_FILES}) - get_filename_component(HEADER_FILE ${HEADER_PATH} NAME) - set(FWK_HEADER_PATH ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE}) -- add_custom_command(TARGET OgreMain POST_BUILD -+ add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD - COMMAND rm -f ${FWK_HEADER_PATH} - ) - endforeach() -@@ -462,23 +462,23 @@ if (APPLE) - foreach(HEADER_PATH ${PLATFORM_HEADERS}) - get_filename_component(HEADER_FILE ${HEADER_PATH} NAME) - set(FWK_HEADER_PATH ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE}) -- add_custom_command(TARGET OgreMain POST_BUILD -+ add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD - COMMAND rm -f ${FWK_HEADER_PATH} - ) - endforeach() - -- ogre_config_framework(OgreMain) -+ ogre_config_framework(${OGRE_NEXT}Main) - endif () - - # Framework is called 'Ogre' - if (OGRE_BUILD_LIBS_AS_FRAMEWORKS) -- set_target_properties(OgreMain PROPERTIES OUTPUT_NAME Ogre) -+ set_target_properties(${OGRE_NEXT}Main PROPERTIES OUTPUT_NAME Ogre) - endif () - endif () --target_link_libraries(OgreMain ${LIBRARIES}) -+target_link_libraries(${OGRE_NEXT}Main ${LIBRARIES}) - if (MINGW) - # may need winsock htons functions for FreeImage -- target_link_libraries(OgreMain ws2_32) -+ target_link_libraries(${OGRE_NEXT}Main ws2_32) - endif () - - #set_source_files_properties( ${SOURCE_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -@@ -488,13 +488,13 @@ endif () - #set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/OgreSubMesh2.cpp" PROPERTIES HEADER_FILE_ONLY FALSE) - - # specify a precompiled header to use --use_precompiled_header(OgreMain -+use_precompiled_header(${OGRE_NEXT}Main - "${CMAKE_CURRENT_SOURCE_DIR}/include/OgreStableHeaders.h" - "${CMAKE_CURRENT_SOURCE_DIR}/src/OgrePrecompiledHeaders.cpp" - ) - --# install OgreMain --ogre_config_lib(OgreMain TRUE) -+# install ${OGRE_NEXT}Main -+ogre_config_lib(${OGRE_NEXT}Main TRUE) - foreach(HEADER_FILE ${HEADER_FILES}) - string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE}) - string(REGEX MATCH "((.*)/)+" HEADER_SUBDIRECTORY ${RELATIVE_HEADER_FILE}) -diff --git a/PlugIns/ParticleFX/CMakeLists.txt b/PlugIns/ParticleFX/CMakeLists.txt -index d21587a4a62..568c08b9f87 100644 ---- a/PlugIns/ParticleFX/CMakeLists.txt -+++ b/PlugIns/ParticleFX/CMakeLists.txt -@@ -17,7 +17,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - add_definitions(-D_USRDLL) - - ogre_add_library(Plugin_ParticleFX ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --target_link_libraries(Plugin_ParticleFX OgreMain) -+target_link_libraries(Plugin_ParticleFX ${OGRE_NEXT}Main) - if (NOT OGRE_STATIC) - set_target_properties(Plugin_ParticleFX PROPERTIES - COMPILE_DEFINITIONS OGRE_PARTICLEFXPLUGIN_EXPORTS -diff --git a/RenderSystems/Direct3D11/CMakeLists.txt b/RenderSystems/Direct3D11/CMakeLists.txt -index 832fc34d1c8..8621d263182 100644 ---- a/RenderSystems/Direct3D11/CMakeLists.txt -+++ b/RenderSystems/Direct3D11/CMakeLists.txt -@@ -41,7 +41,7 @@ add_definitions(-D_USRDLL) - - ogre_add_library(RenderSystem_Direct3D11 ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - target_link_libraries(RenderSystem_Direct3D11 -- OgreMain -+ ${OGRE_NEXT}Main - ${DirectX11_LIBRARIES} - ) - -diff --git a/RenderSystems/GL3Plus/CMakeLists.txt b/RenderSystems/GL3Plus/CMakeLists.txt -index 58e3747dceb..0499a2a62fd 100644 ---- a/RenderSystems/GL3Plus/CMakeLists.txt -+++ b/RenderSystems/GL3Plus/CMakeLists.txt -@@ -104,7 +104,7 @@ else() - ${OGRE_LIB_TYPE} ${HEADER_FILES} ${GLSL_SOURCE} ${PLATFORM_HEADERS} - ${PLATFORM_SOURCES} ${SOURCE_FILES}) - endif() --target_link_libraries(RenderSystem_GL3Plus OgreMain ${OPENGL_LIBRARIES} ${PLATFORM_LIBS}) -+target_link_libraries(RenderSystem_GL3Plus ${OGRE_NEXT}Main ${OPENGL_LIBRARIES} ${PLATFORM_LIBS}) - - if (NOT OGRE_STATIC) - set_target_properties(RenderSystem_GL3Plus PROPERTIES -diff --git a/RenderSystems/Metal/CMakeLists.txt b/RenderSystems/Metal/CMakeLists.txt -index 78802ea02b4..4eb8fc5b8a3 100644 ---- a/RenderSystems/Metal/CMakeLists.txt -+++ b/RenderSystems/Metal/CMakeLists.txt -@@ -24,9 +24,9 @@ include_directories( - - ogre_add_library(RenderSystem_Metal ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - if (OGRE_BUILD_PLATFORM_APPLE_IOS) --target_link_libraries(RenderSystem_Metal OgreMain "-framework Metal" "-framework QuartzCore") -+target_link_libraries(RenderSystem_Metal ${OGRE_NEXT}Main "-framework Metal" "-framework QuartzCore") - else() --target_link_libraries(RenderSystem_Metal OgreMain "-framework Metal" "-framework AppKit" "-framework QuartzCore") -+target_link_libraries(RenderSystem_Metal ${OGRE_NEXT}Main "-framework Metal" "-framework AppKit" "-framework QuartzCore") - endif() - - target_compile_options(RenderSystem_Metal PRIVATE "-fobjc-arc") -diff --git a/RenderSystems/NULL/CMakeLists.txt b/RenderSystems/NULL/CMakeLists.txt -index 3fd12f47940..0fa97a41ac0 100644 ---- a/RenderSystems/NULL/CMakeLists.txt -+++ b/RenderSystems/NULL/CMakeLists.txt -@@ -17,7 +17,7 @@ include_directories( - ) - - ogre_add_library(RenderSystem_NULL ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --target_link_libraries(RenderSystem_NULL OgreMain) -+target_link_libraries(RenderSystem_NULL ${OGRE_NEXT}Main) - - if (OGRE_CONFIG_THREADS) - target_link_libraries(RenderSystem_NULL ${OGRE_THREAD_LIBRARIES}) -diff --git a/RenderSystems/Vulkan/CMakeLists.txt b/RenderSystems/Vulkan/CMakeLists.txt -index d32da5bcbef..4929dd17d4f 100755 ---- a/RenderSystems/Vulkan/CMakeLists.txt -+++ b/RenderSystems/Vulkan/CMakeLists.txt -@@ -33,7 +33,7 @@ include_directories( - include_directories( ${Vulkan_INCLUDE_DIRS} ) - - ogre_add_library(RenderSystem_Vulkan ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) --target_link_libraries(RenderSystem_Vulkan OgreMain ${Vulkan_LIBRARIES}) -+target_link_libraries(RenderSystem_Vulkan ${OGRE_NEXT}Main ${Vulkan_LIBRARIES}) - - if( UNIX AND NOT ANDROID ) - target_link_libraries(RenderSystem_Vulkan xcb-randr X11-xcb) -diff --git a/Samples/2.0/ApiUsage/SceneFormat/CMakeLists.txt b/Samples/2.0/ApiUsage/SceneFormat/CMakeLists.txt -index 9c11aad4802..d864134a47c 100644 ---- a/Samples/2.0/ApiUsage/SceneFormat/CMakeLists.txt -+++ b/Samples/2.0/ApiUsage/SceneFormat/CMakeLists.txt -@@ -22,6 +22,6 @@ add_recursive( ./ SOURCE_FILES ) - - ogre_add_executable(Sample_SceneFormat WIN32 MACOSX_BUNDLE ${SOURCE_FILES} ${SAMPLE_COMMON_RESOURCES}) - --target_link_libraries(Sample_SceneFormat ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} OgreSceneFormat) -+target_link_libraries(Sample_SceneFormat ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} ${OGRE_NEXT}SceneFormat) - ogre_config_sample_lib(Sample_SceneFormat) - ogre_config_sample_pkg(Sample_SceneFormat) -diff --git a/Samples/2.0/CMakeLists.txt b/Samples/2.0/CMakeLists.txt -index c739e2e0533..2427859b29b 100644 ---- a/Samples/2.0/CMakeLists.txt -+++ b/Samples/2.0/CMakeLists.txt -@@ -98,7 +98,7 @@ if( OGRE_BUILD_SAMPLES2 AND NOT OGRE_BUILD_SAMPLES2_SKIP ) - endif() - - if( OGRE_BUILD_SAMPLES2 AND NOT OGRE_BUILD_SAMPLES2_SKIP ) -- set( OGRE_SAMPLES_LIBRARIES "OgreSamplesCommon" "OgreOverlay" ) -+ set( OGRE_SAMPLES_LIBRARIES "OgreSamplesCommon" "${OGRE_NEXT}Overlay" ) - - if( OGRE_STATIC OR WINDOWS_STORE OR WINDOWS_PHONE ) - if( OGRE_BUILD_RENDERSYSTEM_GL3PLUS ) -diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt -index adbe28cf895..ea87ac5b7a3 100644 ---- a/Samples/2.0/Common/CMakeLists.txt -+++ b/Samples/2.0/Common/CMakeLists.txt -@@ -55,4 +55,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES - - link_directories(${CMAKE_CURRENT_BINARY_DIR}) - --target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit) -+target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} ${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}HlmsUnlit) -diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -index 83cd1c712a7..01cb10138c5 100644 ---- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -+++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -@@ -60,6 +60,37 @@ endmacro() - - #---------------------------------------------------------------------------------------- - -+# Outputs TRUE into RESULT_VARIABLE if Ogre was build as OgreNextMain.dll instead of OgreMain.dll -+macro( isOgreNext RESULT_VARIABLE ) -+ if( WIN32 ) -+ if( EXISTS "${OGRE_BINARIES}/bin/Debug/OgreNextMain_d.dll" OR -+ EXISTS "${OGRE_BINARIES}/bin/Release/OgreNextMain.dll" OR -+ EXISTS "${OGRE_BINARIES}/bin/RelWithDebInfo/OgreNextMain.dll" OR -+ EXISTS "${OGRE_BINARIES}/bin/MinSizeRel/OgreNextMain.dll" OR -+ EXISTS "${OGRE_BINARIES}/lib/Debug/OgreNextMainStatic_d.lib" OR -+ EXISTS "${OGRE_BINARIES}/lib/Release/OgreNextMainStatic.lib" OR -+ EXISTS "${OGRE_BINARIES}/lib/RelWithDebInfo/OgreNextMainStatic.lib" OR -+ EXISTS "${OGRE_BINARIES}/lib/MinSizeRel/OgreNextMainStatic.lib") -+ set( ${RESULT_VARIABLE} TRUE ) -+ else() -+ set( ${RESULT_VARIABLE} FALSE ) -+ endif() -+ else() -+ set( DEBUG_SUFFIX "" ) -+ if( ${CMAKE_BUILD_TYPE} STREQUAL "Debug" ) -+ set( DEBUG_SUFFIX "_d" ) -+ endif() -+ if( EXISTS "${OGRE_BINARIES}/lib/libOgreNextMain${DEBUG_SUFFIX}.so" OR -+ EXISTS "${OGRE_BINARIES}/lib/libOgreNextMainStatic${DEBUG_SUFFIX}.a") -+ set( ${RESULT_VARIABLE} TRUE ) -+ else() -+ set( ${RESULT_VARIABLE} FALSE ) -+ endif() -+ endif() -+endmacro() -+ -+#---------------------------------------------------------------------------------------- -+ - # Generates Plugins.cfg file out of user-editable Plugins.cfg.in file. Will automatically disable those plugins - # that were not built - # Copies all relevant DLLs: RenderSystem files, OgreOverlay, Hlms PBS & Unlit. -@@ -94,14 +125,14 @@ macro( setupPluginFileFromTemplate BUILD_TYPE OGRE_USE_SCENE_FORMAT OGRE_USE_PLA - - # Lists of DLLs to copy - set( OGRE_DLLS -- OgreMain -- OgreOverlay -- OgreHlmsPbs -- OgreHlmsUnlit -+ ${OGRE_NEXT}Main -+ ${OGRE_NEXT}Overlay -+ ${OGRE_NEXT}HlmsPbs -+ ${OGRE_NEXT}HlmsUnlit - ) - - if( ${OGRE_USE_SCENE_FORMAT} ) -- set( OGRE_DLLS ${OGRE_DLLS} OgreSceneFormat ) -+ set( OGRE_DLLS ${OGRE_DLLS} ${OGRE_NEXT}SceneFormat ) - endif() - - # Deal with OS and Ogre naming shenanigans: -@@ -199,6 +230,14 @@ else() - link_directories( "${OGRE_BINARIES}/lib" ) - endif() - -+isOgreNext( OGRE_USE_NEW_NAME ) -+message( STATUS ${OGRE_USE_NEW_NAME} ) -+if( ${OGRE_USE_NEW_NAME} ) -+ set( OGRE_NEXT "OgreNext" ) -+else() -+ set( OGRE_NEXT "Ogre" ) -+endif() -+ - # Ogre config - include_directories( "${OGRE_SOURCE}/OgreMain/include" ) - -@@ -229,6 +268,8 @@ else() - message( STATUS "Detected DLL build of Ogre" ) - unset( OGRE_STATIC ) - endif() -+findOgreBuildSetting( ${OGRE_BUILD_SETTINGS_STR} OGRE_BUILD_RENDERSYSTEM_GL3PLUS ) -+findOgreBuildSetting( ${OGRE_BUILD_SETTINGS_STR} OGRE_BUILD_RENDERSYSTEM_D3D11 ) - findOgreBuildSetting( ${OGRE_BUILD_SETTINGS_STR} OGRE_BUILD_RENDERSYSTEM_METAL ) - findOgreBuildSetting( ${OGRE_BUILD_SETTINGS_STR} OGRE_BUILD_RENDERSYSTEM_VULKAN ) - unset( OGRE_BUILD_SETTINGS_STR ) -@@ -250,34 +291,42 @@ if( NOT IOS ) - endif() - endif() - --set( OGRE_LIBRARIES -- debug OgreMain${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- debug OgreOverlay${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- debug OgreHlmsUnlit${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- debug OgreHlmsPbs${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- -- optimized OgreMain${OGRE_STATIC} -- optimized OgreOverlay${OGRE_STATIC} -- optimized OgreHlmsUnlit${OGRE_STATIC} -- optimized OgreHlmsPbs${OGRE_STATIC} -- ${OGRE_DEPENDENCY_LIBS} -- ) -- - if( ${OGRE_USE_SCENE_FORMAT} ) - set( OGRE_LIBRARIES ${OGRE_LIBRARIES} -- debug OgreSceneFormat${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- optimized OgreSceneFormat${OGRE_STATIC} -+ debug ${OGRE_NEXT}SceneFormat${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ optimized ${OGRE_NEXT}SceneFormat${OGRE_STATIC} - ) - endif() - - if( ${OGRE_USE_PLANAR_REFLECTIONS} ) - set( OGRE_LIBRARIES ${OGRE_LIBRARIES} -- debug OgrePlanarReflections${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -- optimized OgrePlanarReflections${OGRE_STATIC} -+ debug ${OGRE_NEXT}PlanarReflections${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ optimized ${OGRE_NEXT}PlanarReflections${OGRE_STATIC} - ) - endif() - - if( OGRE_STATIC ) -+ if( OGRE_BUILD_RENDERSYSTEM_D3D11 ) -+ message( STATUS "Detected D3D11 RenderSystem. Linking against it." ) -+ set( OGRE_LIBRARIES -+ ${OGRE_LIBRARIES} -+ debug RenderSystem_Direct3D11${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ optimized RenderSystem_Direct3D11${OGRE_STATIC} ) -+ include_directories( "${OGRE_SOURCE}/RenderSystems/Direct3D11/include" ) -+ endif() -+ if( OGRE_BUILD_RENDERSYSTEM_GL3PLUS ) -+ message( STATUS "Detected GL3+ RenderSystem. Linking against it." ) -+ set( OGRE_LIBRARIES -+ ${OGRE_LIBRARIES} -+ debug RenderSystem_GL3Plus${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ optimized RenderSystem_GL3Plus${OGRE_STATIC} ) -+ include_directories( "${OGRE_SOURCE}/RenderSystems/GL3Plus/include" -+ "${OGRE_SOURCE}/RenderSystems/GL3Plus/include/GLSL") -+ -+ if( UNIX ) -+ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} Xt Xrandr X11 GL ) -+ endif() -+ endif() - if( OGRE_BUILD_RENDERSYSTEM_METAL ) - message( STATUS "Detected Metal RenderSystem. Linking against it." ) - set( OGRE_LIBRARIES -@@ -293,9 +342,27 @@ if( OGRE_STATIC ) - debug RenderSystem_Vulkan${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} - optimized RenderSystem_Vulkan${OGRE_STATIC} ) - include_directories( "${OGRE_SOURCE}/RenderSystems/Vulkan/include" ) -+ -+ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} xcb X11-xcb xcb-randr ) - endif() - endif() - -+set( OGRE_LIBRARIES -+ ${OGRE_LIBRARIES} -+ -+ debug ${OGRE_NEXT}Overlay${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ debug ${OGRE_NEXT}HlmsUnlit${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ debug ${OGRE_NEXT}HlmsPbs${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ debug ${OGRE_NEXT}Main${OGRE_STATIC}${OGRE_DEBUG_SUFFIX} -+ -+ optimized ${OGRE_NEXT}Overlay${OGRE_STATIC} -+ optimized ${OGRE_NEXT}HlmsUnlit${OGRE_STATIC} -+ optimized ${OGRE_NEXT}HlmsPbs${OGRE_STATIC} -+ optimized ${OGRE_NEXT}Main${OGRE_STATIC} -+ -+ ${OGRE_DEPENDENCY_LIBS} -+ ) -+ - set( OGRE_LIBRARIES_OUT ${OGRE_LIBRARIES} ) - - # Plugins.cfg -@@ -370,5 +437,14 @@ macro( addStaticDependencies OGRE_SOURCE, OGRE_BINARIES, OGRE_BUILD_SETTINGS_STR - optimized ${ZZIPNAME} ) - endif() - -+ message( STATUS "Static lib needs freetype due to Overlays. Linking against it." ) -+ set( TMP_DEPENDENCY_LIBS ${TMP_DEPENDENCY_LIBS} -+ debug freetype${OGRE_DEP_DEBUG_SUFFIX} -+ optimized freetype ) -+ -+ if( UNIX ) -+ set( TMP_DEPENDENCY_LIBS ${TMP_DEPENDENCY_LIBS} dl Xt Xrandr X11 xcb Xaw ) -+ endif() -+ - set( OGRE_DEPENDENCY_LIBS ${TMP_DEPENDENCY_LIBS} ) - endmacro() -diff --git a/Samples/2.0/Tutorials/EmptyProject/CMakeLists.txt b/Samples/2.0/Tutorials/EmptyProject/CMakeLists.txt -index 7089dff51e4..d1119560403 100644 ---- a/Samples/2.0/Tutorials/EmptyProject/CMakeLists.txt -+++ b/Samples/2.0/Tutorials/EmptyProject/CMakeLists.txt -@@ -41,6 +41,8 @@ else() - endif() - - include_directories( "./include" ) -+# Ogre doesn't need this include, but we do because of Rapidjson in UnitTesting.cpp -+include_directories( "./Dependencies/Ogre/Dependencies/include" ) - - add_recursive( ./src SOURCES ) - add_recursive( ./include HEADERS ) -diff --git a/Samples/2.0/Tutorials/Tutorial_Memory/CMakeLists.txt b/Samples/2.0/Tutorials/Tutorial_Memory/CMakeLists.txt -index cbbb6744770..c7d5491d427 100644 ---- a/Samples/2.0/Tutorials/Tutorial_Memory/CMakeLists.txt -+++ b/Samples/2.0/Tutorials/Tutorial_Memory/CMakeLists.txt -@@ -23,6 +23,6 @@ add_recursive( ./ SOURCE_FILES ) - - ogre_add_executable(Sample_Tutorial_Memory WIN32 MACOSX_BUNDLE ${SOURCE_FILES} ${SAMPLE_COMMON_RESOURCES}) - --target_link_libraries(Sample_Tutorial_Memory ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} OgreSceneFormat) -+target_link_libraries(Sample_Tutorial_Memory ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} ${OGRE_NEXT}SceneFormat) - ogre_config_sample_lib(Sample_Tutorial_Memory) - ogre_config_sample_pkg(Sample_Tutorial_Memory) -diff --git a/Samples/2.0/Tutorials/Tutorial_Terrain/CMakeLists.txt b/Samples/2.0/Tutorials/Tutorial_Terrain/CMakeLists.txt -index e8d1624064a..b5b227dee51 100644 ---- a/Samples/2.0/Tutorials/Tutorial_Terrain/CMakeLists.txt -+++ b/Samples/2.0/Tutorials/Tutorial_Terrain/CMakeLists.txt -@@ -27,7 +27,7 @@ endif() - - ogre_add_executable(Sample_Tutorial_Terrain WIN32 MACOSX_BUNDLE ${SOURCE_FILES} ${SAMPLE_COMMON_RESOURCES}) - --target_link_libraries(Sample_Tutorial_Terrain ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} OgreHlmsPbs) -+target_link_libraries(Sample_Tutorial_Terrain ${OGRE_LIBRARIES} ${OGRE_SAMPLES_LIBRARIES} ${OGRE_NEXT}HlmsPbs) - if( OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS ) - target_link_libraries( Sample_Tutorial_Terrain OgrePlanarReflections ) - endif() -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 9f31aedfd04..5167104f0c2 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -145,7 +145,7 @@ if (OGRE_BUILD_TESTS) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Components/Overlay/include - ${OGRE_SOURCE_DIR}/Components/Overlay/include) - -- set(OGRE_LIBRARIES ${OGRE_LIBRARIES} OgreOverlay) -+ set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${OGRE_NEXT}Overlay) - endif () - add_executable(Test_Ogre WIN32 ${HEADER_FILES} ${SOURCE_FILES} ${RESOURCE_FILES} ) - ogre_config_sample_exe(Test_Ogre) - diff --git a/recipe/add_suffix_in_install_also_for_runtime.patch b/recipe/add_suffix_in_install_also_for_runtime.patch deleted file mode 100644 index 7a13711..0000000 --- a/recipe/add_suffix_in_install_also_for_runtime.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 9332310060138c9a80bebfb7933bcefcfcdfb79c Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sat, 25 Jun 2022 12:49:13 +0200 -Subject: [PATCH] Update OgreConfigTargets.cmake - ---- - CMake/Utils/OgreConfigTargets.cmake | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake -index 74a08af3f26..2810001a1bc 100644 ---- a/CMake/Utils/OgreConfigTargets.cmake -+++ b/CMake/Utils/OgreConfigTargets.cmake -@@ -98,28 +98,28 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT) - if(EXPORT) - install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports - BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" -- RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" -+ RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports - BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -+ RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELWDBG_PATH}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports - BUNDLE DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -+ RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_MINSIZE_PATH}/MinSizeRel" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports - BUNDLE DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug -- RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug -+ RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_DEBUG_PATH}/Debug" CONFIGURATIONS Debug -@@ -128,28 +128,28 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT) - else() - install(TARGETS ${TARGETNAME} - BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" -- RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None "" -+ RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -+ RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELWDBG_PATH}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - BUNDLE DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -+ RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_MINSIZE_PATH}/MinSizeRel" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - BUNDLE DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug -- RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug -+ RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_DEBUG_PATH}/Debug" CONFIGURATIONS Debug - diff --git a/recipe/backport_hlms_bugfix.patch b/recipe/backport_hlms_bugfix.patch deleted file mode 100644 index 3842265..0000000 --- a/recipe/backport_hlms_bugfix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5efd94a718a889a3996621e56039c0573aaa113e Mon Sep 17 00:00:00 2001 -From: "Matias N. Goldberg" -Date: Sat, 2 Apr 2022 20:09:51 -0300 -Subject: [PATCH] Fix inconsistent DLL linkage - ---- - Components/Hlms/Pbs/CMakeLists.txt | 2 ++ - Components/Hlms/Pbs/include/OgreHlmsPbsPrerequisites.h | 2 +- - Components/Hlms/Unlit/CMakeLists.txt | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Components/Hlms/Pbs/CMakeLists.txt b/Components/Hlms/Pbs/CMakeLists.txt -index c6a2f5fde40..48ffb610a21 100644 ---- a/Components/Hlms/Pbs/CMakeLists.txt -+++ b/Components/Hlms/Pbs/CMakeLists.txt -@@ -40,6 +40,8 @@ if( OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS ) - ogre_add_component_include_dir( PlanarReflections ) - endif() - -+add_definitions( -DOgreHlmsPbs_EXPORTS ) -+ - ogre_add_library(${OGRE_NEXT}HlmsPbs ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - set_target_properties(${OGRE_NEXT}HlmsPbs PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) - target_link_libraries(${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}Main) -diff --git a/Components/Hlms/Unlit/CMakeLists.txt b/Components/Hlms/Unlit/CMakeLists.txt -index ff87fbec51d..b0348d0b1af 100644 ---- a/Components/Hlms/Unlit/CMakeLists.txt -+++ b/Components/Hlms/Unlit/CMakeLists.txt -@@ -26,6 +26,8 @@ file( - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Common/include) - -+add_definitions( -DOgreHlmsUnlit_EXPORTS ) -+ - ogre_add_library(${OGRE_NEXT}HlmsUnlit ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - set_target_properties(${OGRE_NEXT}HlmsUnlit PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) - target_link_libraries(${OGRE_NEXT}HlmsUnlit ${OGRE_NEXT}Main) - diff --git a/recipe/bld.bat b/recipe/bld.bat index 7588f26..db2a682 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -31,6 +31,7 @@ cmake ^ -DOGRE_GLSUPPORT_USE_EGL_HEADLESS:BOOL=OFF ^ -DOGRE_GLSUPPORT_USE_WGL:BOOL=ON ^ -DOGRE_USE_NEW_PROJECT_NAME:BOOL=ON ^ + -DOGRE_CONFIG_GENERATE_PKGCONFIG:BOOL=ON ^ %SRC_DIR% if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index 53dc0b3..f12172b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,8 +4,10 @@ # See https://github.com/conda-forge/staged-recipes/pull/18792#issuecomment-1114606992 export CXXFLAGS="-D__STDC_FORMAT_MACROS $CXXFLAGS" +# -Wno-elaborated-enum-base added as a a workaround for https://github.com/conda-forge/ogre-next-feedstock/pull/18#issuecomment-2042065032 if [[ ${target_platform} == "osx-64" || ${target_platform} == "osx-arm64" ]]; then export OGRE_BUILD_METAL=ON + export CXXFLAGS="-Wno-elaborated-enum-base $CXXFLAGS" else export OGRE_BUILD_METAL=OFF fi diff --git a/recipe/change_header_install_from_OGRE_to_OGRE-Next.patch b/recipe/change_header_install_from_OGRE_to_OGRE-Next.patch deleted file mode 100644 index e7f73ed..0000000 --- a/recipe/change_header_install_from_OGRE_to_OGRE-Next.patch +++ /dev/null @@ -1,354 +0,0 @@ -From d5a0cd68be7e93c6a21893e464a393c2bb045474 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Fri, 24 Jun 2022 18:09:40 +0200 -Subject: [PATCH] Change header destination from OGRE to OGRE-Next - ---- - CMake/ConfigureBuild.cmake | 2 +- - Components/Hlms/Pbs/CMakeLists.txt | 4 ++-- - Components/Hlms/PbsMobile/CMakeLists.txt | 2 +- - Components/Hlms/Unlit/CMakeLists.txt | 4 ++-- - Components/Hlms/UnlitMobile/CMakeLists.txt | 2 +- - Components/MeshLodGenerator/CMakeLists.txt | 2 +- - Components/Overlay/CMakeLists.txt | 2 +- - Components/Paging/CMakeLists.txt | 2 +- - Components/PlanarReflections/CMakeLists.txt | 2 +- - Components/Property/CMakeLists.txt | 2 +- - Components/RTShaderSystem/CMakeLists.txt | 2 +- - Components/SceneFormat/CMakeLists.txt | 2 +- - Components/Terrain/CMakeLists.txt | 2 +- - Components/Volume/CMakeLists.txt | 2 +- - OgreMain/CMakeLists.txt | 8 ++++---- - PlugIns/ParticleFX/CMakeLists.txt | 2 +- - RenderSystems/Direct3D11/CMakeLists.txt | 2 +- - RenderSystems/Direct3D9/CMakeLists.txt | 2 +- - RenderSystems/GL3Plus/CMakeLists.txt | 12 ++++++------ - RenderSystems/GLES2/CMakeLists.txt | 10 +++++----- - RenderSystems/Metal/CMakeLists.txt | 6 +++--- - RenderSystems/NULL/CMakeLists.txt | 6 +++--- - RenderSystems/Vulkan/CMakeLists.txt | 6 +++--- - 23 files changed, 43 insertions(+), 43 deletions(-) - -diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake -index 30e82016c5f..f17548ad52b 100644 ---- a/CMake/ConfigureBuild.cmake -+++ b/CMake/ConfigureBuild.cmake -@@ -250,7 +250,7 @@ install( FILES - ${OGRE_BINARY_DIR}/include/OgreBuildSettings.h - ${OGRE_BINARY_DIR}/include/OgreGL3PlusBuildSettings.h - ${OGRE_BINARY_DIR}/include/OgreVulkanBuildSettings.h -- DESTINATION include/OGRE -+ DESTINATION include/OGRE-Next - ) - - -diff --git a/Components/Hlms/Pbs/CMakeLists.txt b/Components/Hlms/Pbs/CMakeLists.txt -index be628b88b72..a12a543938d 100644 ---- a/Components/Hlms/Pbs/CMakeLists.txt -+++ b/Components/Hlms/Pbs/CMakeLists.txt -@@ -52,12 +52,12 @@ ogre_config_framework(${OGRE_NEXT}HlmsPbs) - ogre_config_component(${OGRE_NEXT}HlmsPbs) - - install (DIRECTORY include/ -- DESTINATION include/OGRE/Hlms/Pbs -+ DESTINATION include/OGRE-Next/Hlms/Pbs - FILES_MATCHING PATTERN "*.h" - ) - - # also install HLMS Common folder - install (DIRECTORY ../Common/include/ -- DESTINATION include/OGRE/Hlms/Common -+ DESTINATION include/OGRE-Next/Hlms/Common - FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" - ) -diff --git a/Components/Hlms/PbsMobile/CMakeLists.txt b/Components/Hlms/PbsMobile/CMakeLists.txt -index 552cfe07b6d..51eccd78c19 100644 ---- a/Components/Hlms/PbsMobile/CMakeLists.txt -+++ b/Components/Hlms/PbsMobile/CMakeLists.txt -@@ -24,5 +24,5 @@ ogre_config_framework(OgreHlmsPbsMobile) - ogre_config_component(OgreHlmsPbsMobile) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Hlms/PbsMobile -+ DESTINATION include/OGRE-Next/Hlms/PbsMobile - ) -diff --git a/Components/Hlms/Unlit/CMakeLists.txt b/Components/Hlms/Unlit/CMakeLists.txt -index 0f46fed7b0e..6df78c9860a 100644 ---- a/Components/Hlms/Unlit/CMakeLists.txt -+++ b/Components/Hlms/Unlit/CMakeLists.txt -@@ -34,12 +34,12 @@ ogre_config_framework(${OGRE_NEXT}HlmsUnlit) - ogre_config_component(${OGRE_NEXT}HlmsUnlit) - - install (DIRECTORY include/ -- DESTINATION include/OGRE/Hlms/Unlit -+ DESTINATION include/OGRE-Next/Hlms/Unlit - FILES_MATCHING PATTERN "*.h" - ) - - # also install HLMS Common folder - install (DIRECTORY ../Common/include/ -- DESTINATION include/OGRE/Hlms/Common -+ DESTINATION include/OGRE-Next/Hlms/Common - FILES_MATCHING PATTERN "*.h" PATTERN "*.inl" - ) -diff --git a/Components/Hlms/UnlitMobile/CMakeLists.txt b/Components/Hlms/UnlitMobile/CMakeLists.txt -index 159b40337db..411ebc6a6a2 100644 ---- a/Components/Hlms/UnlitMobile/CMakeLists.txt -+++ b/Components/Hlms/UnlitMobile/CMakeLists.txt -@@ -24,5 +24,5 @@ ogre_config_framework(OgreHlmsUnlitMobile) - ogre_config_component(OgreHlmsUnlitMobile) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Hlms/UnlitMobile -+ DESTINATION include/OGRE-Next/Hlms/UnlitMobile - ) -diff --git a/Components/MeshLodGenerator/CMakeLists.txt b/Components/MeshLodGenerator/CMakeLists.txt -index 0ad2fe6199b..ce699e09edd 100644 ---- a/Components/MeshLodGenerator/CMakeLists.txt -+++ b/Components/MeshLodGenerator/CMakeLists.txt -@@ -37,5 +37,5 @@ ogre_config_framework(${OGRE_NEXT}MeshLodGenerator) - ogre_config_component(${OGRE_NEXT}MeshLodGenerator) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/MeshLodGenerator -+ DESTINATION include/OGRE-Next/MeshLodGenerator - ) -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index 372e1be09eb..3ae4eda0615 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -41,6 +41,6 @@ ogre_config_framework(${OGRE_NEXT}Overlay) - ogre_config_component(${OGRE_NEXT}Overlay) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Overlay -+ DESTINATION include/OGRE-Next/Overlay - ) - -diff --git a/Components/Paging/CMakeLists.txt b/Components/Paging/CMakeLists.txt -index 29d852c5609..891186d030b 100644 ---- a/Components/Paging/CMakeLists.txt -+++ b/Components/Paging/CMakeLists.txt -@@ -37,5 +37,5 @@ ogre_config_framework(OgrePaging) - ogre_config_component(OgrePaging) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Paging -+ DESTINATION include/OGRE-Next/Paging - ) -diff --git a/Components/PlanarReflections/CMakeLists.txt b/Components/PlanarReflections/CMakeLists.txt -index c517bbced43..f4d58971e84 100644 ---- a/Components/PlanarReflections/CMakeLists.txt -+++ b/Components/PlanarReflections/CMakeLists.txt -@@ -31,5 +31,5 @@ ogre_config_framework(${OGRE_NEXT}PlanarReflections) - ogre_config_component(${OGRE_NEXT}PlanarReflections) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/PlanarReflections -+ DESTINATION include/OGRE-Next/PlanarReflections - ) -diff --git a/Components/Property/CMakeLists.txt b/Components/Property/CMakeLists.txt -index 9cc1ccb995c..4fc22f97205 100644 ---- a/Components/Property/CMakeLists.txt -+++ b/Components/Property/CMakeLists.txt -@@ -45,6 +45,6 @@ ogre_config_framework(OgreProperty) - ogre_config_component(OgreProperty) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Property -+ DESTINATION include/OGRE-Next/Property - ) - -diff --git a/Components/RTShaderSystem/CMakeLists.txt b/Components/RTShaderSystem/CMakeLists.txt -index 7db93497301..4c5637cb1a8 100644 ---- a/Components/RTShaderSystem/CMakeLists.txt -+++ b/Components/RTShaderSystem/CMakeLists.txt -@@ -24,5 +24,5 @@ ogre_config_framework(OgreRTShaderSystem) - ogre_config_component(OgreRTShaderSystem) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/RTShaderSystem -+ DESTINATION include/OGRE-Next/RTShaderSystem - ) -diff --git a/Components/SceneFormat/CMakeLists.txt b/Components/SceneFormat/CMakeLists.txt -index 34ea9f85b24..1c9aa8512ac 100644 ---- a/Components/SceneFormat/CMakeLists.txt -+++ b/Components/SceneFormat/CMakeLists.txt -@@ -34,5 +34,5 @@ ogre_config_framework(${OGRE_NEXT}SceneFormat) - ogre_config_component(${OGRE_NEXT}SceneFormat) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/SceneFormat -+ DESTINATION include/OGRE-Next/SceneFormat - ) -diff --git a/Components/Terrain/CMakeLists.txt b/Components/Terrain/CMakeLists.txt -index 8c023860740..59177783d38 100644 ---- a/Components/Terrain/CMakeLists.txt -+++ b/Components/Terrain/CMakeLists.txt -@@ -60,6 +60,6 @@ ogre_config_framework(OgreTerrain) - ogre_config_component(OgreTerrain) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Terrain -+ DESTINATION include/OGRE-Next/Terrain - ) - -diff --git a/Components/Volume/CMakeLists.txt b/Components/Volume/CMakeLists.txt -index 74e801d2c18..d47801c7a26 100644 ---- a/Components/Volume/CMakeLists.txt -+++ b/Components/Volume/CMakeLists.txt -@@ -38,6 +38,6 @@ ogre_config_framework(OgreVolume) - ogre_config_component(OgreVolume) - - install(FILES ${HEADER_FILES} -- DESTINATION include/OGRE/Volume -+ DESTINATION include/OGRE-Next/Volume - ) - -diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 866d98126f3..6a039bd5453 100644 ---- a/OgreMain/CMakeLists.txt -+++ b/OgreMain/CMakeLists.txt -@@ -498,14 +498,14 @@ ogre_config_lib(${OGRE_NEXT}Main TRUE) - foreach(HEADER_FILE ${HEADER_FILES}) - string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE}) - string(REGEX MATCH "((.*)/)+" HEADER_SUBDIRECTORY ${RELATIVE_HEADER_FILE}) -- install(FILES ${HEADER_FILE} DESTINATION include/OGRE/${HEADER_SUBDIRECTORY}) -+ install(FILES ${HEADER_FILE} DESTINATION include/OGRE-Next/${HEADER_SUBDIRECTORY}) - endforeach() - - install(FILES ${PLATFORM_HEADERS} -- DESTINATION include/OGRE/${PLATFORM_HEADER_INSTALL} -+ DESTINATION include/OGRE-Next/${PLATFORM_HEADER_INSTALL} - ) - install(FILES ${THREAD_HEADER_FILES} -- DESTINATION include/OGRE/Threading -+ DESTINATION include/OGRE-Next/Threading - ) - - set( DEPRECATED_HEADER_FILES -@@ -528,5 +528,5 @@ set( DEPRECATED_HEADER_FILES - ) - - install(FILES ${DEPRECATED_HEADER_FILES} -- DESTINATION include/OGRE/Deprecated -+ DESTINATION include/OGRE-Next/Deprecated - ) -diff --git a/PlugIns/ParticleFX/CMakeLists.txt b/PlugIns/ParticleFX/CMakeLists.txt -index d21587a4a62..23f3bf33a0c 100644 ---- a/PlugIns/ParticleFX/CMakeLists.txt -+++ b/PlugIns/ParticleFX/CMakeLists.txt -@@ -27,5 +27,5 @@ endif () - ogre_config_framework(Plugin_ParticleFX) - - ogre_config_plugin(Plugin_ParticleFX) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/Plugins/ParticleFX) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/Plugins/ParticleFX) - -diff --git a/RenderSystems/Direct3D11/CMakeLists.txt b/RenderSystems/Direct3D11/CMakeLists.txt -index 832fc34d1c8..e54602a8472 100644 ---- a/RenderSystems/Direct3D11/CMakeLists.txt -+++ b/RenderSystems/Direct3D11/CMakeLists.txt -@@ -65,4 +65,4 @@ if( OGRE_CONFIG_AMD_AGS ) - endif() - - ogre_config_plugin(RenderSystem_Direct3D11) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Direct3D11) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/Direct3D11) -diff --git a/RenderSystems/Direct3D9/CMakeLists.txt b/RenderSystems/Direct3D9/CMakeLists.txt -index beb69d227ad..23b8879a95b 100644 ---- a/RenderSystems/Direct3D9/CMakeLists.txt -+++ b/RenderSystems/Direct3D9/CMakeLists.txt -@@ -47,4 +47,4 @@ if(OGRE_CONFIG_ENABLE_QUAD_BUFFER_STEREO) - endif() - - ogre_config_plugin(RenderSystem_Direct3D9) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Direct3D9) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/Direct3D9) -diff --git a/RenderSystems/GL3Plus/CMakeLists.txt b/RenderSystems/GL3Plus/CMakeLists.txt -index 58e3747dceb..3c442c9cc2a 100644 ---- a/RenderSystems/GL3Plus/CMakeLists.txt -+++ b/RenderSystems/GL3Plus/CMakeLists.txt -@@ -123,15 +123,15 @@ endif () - ogre_config_framework(RenderSystem_GL3Plus) - - ogre_config_plugin(RenderSystem_GL3Plus) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/GL3Plus) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/GL3Plus) - if( OGRE_GLSUPPORT_USE_GLX ) -- install(FILES ${PLATFORM_HEADERS_GLX} DESTINATION include/OGRE/RenderSystems/GL3Plus/GLX) -+ install(FILES ${PLATFORM_HEADERS_GLX} DESTINATION include/OGRE-Next/RenderSystems/GL3Plus/GLX) - endif() - if( OGRE_GLSUPPORT_USE_COCOA ) -- install(FILES ${PLATFORM_HEADERS_OSX} DESTINATION include/OGRE/RenderSystems/GL3Plus/OSX) -+ install(FILES ${PLATFORM_HEADERS_OSX} DESTINATION include/OGRE-Next/RenderSystems/GL3Plus/OSX) - endif() - if( OGRE_GLSUPPORT_USE_EGL_HEADLESS ) -- install(FILES ${PLATFORM_HEADERS_EGL} DESTINATION include/OGRE/RenderSystems/GL3Plus/EGL) -+ install(FILES ${PLATFORM_HEADERS_EGL} DESTINATION include/OGRE-Next/RenderSystems/GL3Plus/EGL) - endif() --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/OGRE/RenderSystems/GL3Plus) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL/ DESTINATION include/OGRE/RenderSystems/GL3Plus) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/OGRE-Next/RenderSystems/GL3Plus) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL/ DESTINATION include/OGRE-Next/RenderSystems/GL3Plus) -diff --git a/RenderSystems/GLES2/CMakeLists.txt b/RenderSystems/GLES2/CMakeLists.txt -index 56ed97d3d10..2f7e0884d35 100644 ---- a/RenderSystems/GLES2/CMakeLists.txt -+++ b/RenderSystems/GLES2/CMakeLists.txt -@@ -130,8 +130,8 @@ endif () - - ogre_config_plugin(RenderSystem_GLES2) - --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/GLES2) --install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE/RenderSystems/GLES2/${PLATFORM_HEADER_INSTALL}) --install(FILES ${GLESW_HEADERS} DESTINATION include/OGRE/RenderSystems/GLES2/${GLESW_HEADER_INSTALL}) --install(FILES ${KHR_HEADERS} DESTINATION include/OGRE/RenderSystems/GLES2/KHR) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/GLSLES/include/ DESTINATION include/OGRE/RenderSystems/GLES2/GLSLES) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/GLES2) -+install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/GLES2/${PLATFORM_HEADER_INSTALL}) -+install(FILES ${GLESW_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/GLES2/${GLESW_HEADER_INSTALL}) -+install(FILES ${KHR_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/GLES2/KHR) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/GLSLES/include/ DESTINATION include/OGRE-Next/RenderSystems/GLES2/GLSLES) -diff --git a/RenderSystems/Metal/CMakeLists.txt b/RenderSystems/Metal/CMakeLists.txt -index 78802ea02b4..5c622d3674d 100644 ---- a/RenderSystems/Metal/CMakeLists.txt -+++ b/RenderSystems/Metal/CMakeLists.txt -@@ -39,6 +39,6 @@ endif () - ogre_config_framework(RenderSystem_Metal) - - ogre_config_plugin(RenderSystem_Metal) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Metal) --install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE/RenderSystems/Metal/${PLATFORM_HEADER_INSTALL}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE/RenderSystems/Metal) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/Metal) -+install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/Metal/${PLATFORM_HEADER_INSTALL}) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE-Next/RenderSystems/Metal) -diff --git a/RenderSystems/NULL/CMakeLists.txt b/RenderSystems/NULL/CMakeLists.txt -index 3fd12f47940..f1e2f3e5abe 100644 ---- a/RenderSystems/NULL/CMakeLists.txt -+++ b/RenderSystems/NULL/CMakeLists.txt -@@ -26,6 +26,6 @@ endif () - ogre_config_framework(RenderSystem_NULL) - - ogre_config_plugin(RenderSystem_NULL) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/NULL) --install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE/RenderSystems/NULL/${PLATFORM_HEADER_INSTALL}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE/RenderSystems/NULL) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/NULL) -+install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/NULL/${PLATFORM_HEADER_INSTALL}) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE-Next/RenderSystems/NULL) -diff --git a/RenderSystems/Vulkan/CMakeLists.txt b/RenderSystems/Vulkan/CMakeLists.txt -index 3b0d4434fdc..96a1533237f 100755 ---- a/RenderSystems/Vulkan/CMakeLists.txt -+++ b/RenderSystems/Vulkan/CMakeLists.txt -@@ -48,6 +48,6 @@ endif () - ogre_config_framework(RenderSystem_Vulkan) - - ogre_config_plugin(RenderSystem_Vulkan) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Vulkan) --install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE/RenderSystems/Vulkan/${PLATFORM_HEADER_INSTALL}) --install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE/RenderSystems/Vulkan) -+install(FILES ${HEADER_FILES} DESTINATION include/OGRE-Next/RenderSystems/Vulkan) -+install(FILES ${PLATFORM_HEADERS} DESTINATION include/OGRE-Next/RenderSystems/Vulkan/${PLATFORM_HEADER_INSTALL}) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/OGRE-Next/RenderSystems/Vulkan) - diff --git a/recipe/change_plugin_installs_from_OGRE_to_OGRE-Next.patch b/recipe/change_plugin_installs_from_OGRE_to_OGRE-Next.patch deleted file mode 100644 index 241bc1a..0000000 --- a/recipe/change_plugin_installs_from_OGRE_to_OGRE-Next.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8e1a60f3c9d8401744affab29d4d92a2e2524db7 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Fri, 24 Jun 2022 19:21:31 +0200 -Subject: [PATCH] Change installation directory of plugins from lib/OGRE to - lib/OGRE-Next - ---- - CMake/Utils/OgreConfigTargets.cmake | 39 +++++++---------------------- - 1 file changed, 9 insertions(+), 30 deletions(-) - -diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake -index a6c65d01c61..11cc92bfe1f 100644 ---- a/CMake/Utils/OgreConfigTargets.cmake -+++ b/CMake/Utils/OgreConfigTargets.cmake -@@ -41,36 +41,15 @@ if (NOT OGRE_RUNTIME_OUTPUT) - set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin) - endif () - --if (WIN32) -- set(OGRE_RELEASE_PATH "/Release") -- set(OGRE_RELWDBG_PATH "/RelWithDebInfo") -- set(OGRE_MINSIZE_PATH "/MinSizeRel") -- set(OGRE_DEBUG_PATH "/Debug") -- set(OGRE_LIB_RELEASE_PATH "/Release") -- set(OGRE_LIB_RELWDBG_PATH "/RelWithDebInfo") -- set(OGRE_LIB_MINSIZE_PATH "/MinSizeRel") -- set(OGRE_LIB_DEBUG_PATH "/Debug") -- set(OGRE_PLUGIN_PATH "/opt") -- set(OGRE_SAMPLE_PATH "/opt/samples") --elseif (UNIX) -- set(OGRE_RELEASE_PATH "") -- set(OGRE_RELWDBG_PATH "") -- set(OGRE_MINSIZE_PATH "") -- set(OGRE_DEBUG_PATH "") -- set(OGRE_LIB_RELEASE_PATH "") -- set(OGRE_LIB_RELWDBG_PATH "") -- set(OGRE_LIB_MINSIZE_PATH "") -- set(OGRE_LIB_DEBUG_PATH "") -- if(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) -- set(OGRE_LIB_RELEASE_PATH "/Release") -- endif(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS) -- if (APPLE) -- set(OGRE_PLUGIN_PATH "/") -- else() -- set(OGRE_PLUGIN_PATH "/OGRE") -- endif(APPLE) -- set(OGRE_SAMPLE_PATH "/OGRE/Samples") --endif () -+set(OGRE_RELEASE_PATH "") -+set(OGRE_RELWDBG_PATH "") -+set(OGRE_MINSIZE_PATH "") -+set(OGRE_DEBUG_PATH "") -+set(OGRE_LIB_RELEASE_PATH "") -+set(OGRE_LIB_RELWDBG_PATH "") -+set(OGRE_LIB_MINSIZE_PATH "") -+set(OGRE_LIB_DEBUG_PATH "") -+set(OGRE_PLUGIN_PATH "/OGRE-Next") - - # create vcproj.user file for Visual Studio to set debug working directory - function(ogre_create_vcproj_userfile TARGETNAME) - diff --git a/recipe/fix_pc_files_generation.patch b/recipe/fix_pc_files_generation.patch deleted file mode 100644 index 9c9284e..0000000 --- a/recipe/fix_pc_files_generation.patch +++ /dev/null @@ -1,294 +0,0 @@ -From 0d9fa7c32aeee75d2b9ad43bfea64b43e591f789 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Fri, 24 Jun 2022 19:21:58 +0200 -Subject: [PATCH] Fix generation of .pc files to handle the change from OGRE to - OGRE-Next - ---- - CMake/ConfigureBuild.cmake | 50 ++++++++++++--------- - CMake/Templates/OGRE-Hlms.pc.in | 8 ++-- - CMake/Templates/OGRE-MeshLodGenerator.pc.in | 8 ++-- - CMake/Templates/OGRE-Overlay.pc.in | 8 ++-- - CMake/Templates/OGRE-Paging.pc.in | 8 ++-- - CMake/Templates/OGRE-Property.pc.in | 8 ++-- - CMake/Templates/OGRE-RTShaderSystem.pc.in | 8 ++-- - CMake/Templates/OGRE-Terrain.pc.in | 8 ++-- - CMake/Templates/OGRE-Volume.pc.in | 8 ++-- - CMake/Templates/OGRE.pc.in | 8 ++-- - 10 files changed, 64 insertions(+), 58 deletions(-) - -diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake -index 19c5e99f5fe..e220e72cba8 100644 ---- a/CMake/ConfigureBuild.cmake -+++ b/CMake/ConfigureBuild.cmake -@@ -248,7 +248,7 @@ install(FILES ${OGRE_BINARY_DIR}/include/OgreBuildSettings.h DESTINATION include - - - # Create the pkg-config package files on Unix systems --if (UNIX) -+#if (UNIX) - set(OGRE_LIB_SUFFIX "") - set(OGRE_PLUGIN_PREFIX "") - set(OGRE_PLUGIN_EXT ".so") -@@ -262,6 +262,12 @@ if (UNIX) - set(OGRE_LIB_SUFFIX "${OGRE_LIB_SUFFIX}_d") - endif () - -+ if (WIN32) -+ set(OGRE_PLUGIN_DIRECTORY bin) -+ else () -+ set(OGRE_PLUGIN_DIRECTORY $OGRE_LIB_DIRECTORY) -+ endif () -+ - set(OGRE_ADDITIONAL_LIBS "") - set(OGRE_CFLAGS "") - set(OGRE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}) -@@ -275,58 +281,58 @@ if (UNIX) - endif () - # there is no pkgconfig file for freeimage, so we need to add that lib manually - set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") -- configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next.pc @ONLY) - else () -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next.pc @ONLY) - endif () -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - - # configure additional packages - - if (OGRE_BUILD_COMPONENT_PAGING) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Paging.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_MESHLODGENERATOR) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-MeshLodGenerator.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_TERRAIN) - if (OGRE_BUILD_COMPONENT_PAGING) -- set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}") -+ set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Next-Paging = ${OGRE_VERSION}") - endif () -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Terrain.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Terrain.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-RTShaderSystem.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-RTShaderSystem.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-RTShaderSystem.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-RTShaderSystem.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_PROPERTY) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Property.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_OVERLAY) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Overlay.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Overlay.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Overlay.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Overlay.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Overlay.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Overlay.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_VOLUME) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Volume.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Volume.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Volume.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Volume.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Volume.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Volume.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - - if (OGRE_BUILD_COMPONENT_HLMS) -- configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Hlms.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Hlms.pc @ONLY) -- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Hlms.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) -+ configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Hlms.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Hlms.pc @ONLY) -+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Next-Hlms.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig) - endif () - --endif () -+# endif () - - if(OGRE_CONFIG_STATIC_LINK_CRT) - #We statically link to reduce dependencies -diff --git a/CMake/Templates/OGRE-Hlms.pc.in b/CMake/Templates/OGRE-Hlms.pc.in -index d046bea915d..a7596a0c9ec 100644 ---- a/CMake/Templates/OGRE-Hlms.pc.in -+++ b/CMake/Templates/OGRE-Hlms.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Hlms -+Name: OGRE-Next-Hlms - Description: HLMS component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreHlmsPbs@OGRE_LIB_SUFFIX@ -lOgreHlmsUnlit@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Hlms @OGRE_CFLAGS@ -\ No newline at end of file -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextHlmsPbs@OGRE_LIB_SUFFIX@ -lOgreHlmsUnlit@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Hlms @OGRE_CFLAGS@ -\ No newline at end of file -diff --git a/CMake/Templates/OGRE-MeshLodGenerator.pc.in b/CMake/Templates/OGRE-MeshLodGenerator.pc.in -index 22e01ba7a75..fd206189b01 100644 ---- a/CMake/Templates/OGRE-MeshLodGenerator.pc.in -+++ b/CMake/Templates/OGRE-MeshLodGenerator.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-MeshLodGenerator -+Name: OGRE-Next-MeshLodGenerator - Description: Mesh Lod Generator for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreMeshLodGenerator@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/MeshLodGenerator @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextMeshLodGenerator@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/MeshLodGenerator @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE-Overlay.pc.in b/CMake/Templates/OGRE-Overlay.pc.in -index da2e9dde130..81a077b1004 100644 ---- a/CMake/Templates/OGRE-Overlay.pc.in -+++ b/CMake/Templates/OGRE-Overlay.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Overlay -+Name: OGRE-Next-Overlay - Description: Overlay component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreOverlay@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Overlay @OGRE_CFLAGS@ -\ No newline at end of file -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextOverlay@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Overlay @OGRE_CFLAGS@ -\ No newline at end of file -diff --git a/CMake/Templates/OGRE-Paging.pc.in b/CMake/Templates/OGRE-Paging.pc.in -index 356199b0251..0a10e7ccd9c 100644 ---- a/CMake/Templates/OGRE-Paging.pc.in -+++ b/CMake/Templates/OGRE-Paging.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Paging -+Name: OGRE-Next-Paging - Description: General purpose paging component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgrePaging@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Paging @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextPaging@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Paging @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE-Property.pc.in b/CMake/Templates/OGRE-Property.pc.in -index a177699a193..7451d61f816 100644 ---- a/CMake/Templates/OGRE-Property.pc.in -+++ b/CMake/Templates/OGRE-Property.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Property -+Name: OGRE-Next-Property - Description: General purpose property component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreProperty@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Property @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextProperty@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Property @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE-RTShaderSystem.pc.in b/CMake/Templates/OGRE-RTShaderSystem.pc.in -index e50a5740a7a..ac93ca75dda 100644 ---- a/CMake/Templates/OGRE-RTShaderSystem.pc.in -+++ b/CMake/Templates/OGRE-RTShaderSystem.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-RTShaderSystem -+Name: OGRE-Next-RTShaderSystem - Description: Real time shader generation component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreRTShaderSystem@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/RTShaderSystem @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextRTShaderSystem@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/RTShaderSystem @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE-Terrain.pc.in b/CMake/Templates/OGRE-Terrain.pc.in -index 356cd11f0d2..20c2d5917e1 100644 ---- a/CMake/Templates/OGRE-Terrain.pc.in -+++ b/CMake/Templates/OGRE-Terrain.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Terrain -+Name: OGRE-Next-Terrain - Description: Outdoor terrain component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ @OGRE_PAGING_ADDITIONAL_PACKAGES@ --Libs: -L${libdir} -lOgreTerrain@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Terrain @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ @OGRE_PAGING_ADDITIONAL_PACKAGES@ -+Libs: -L${libdir} -lOgreNextTerrain@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Terrain @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE-Volume.pc.in b/CMake/Templates/OGRE-Volume.pc.in -index 792dc7d6710..37239c3a4a5 100644 ---- a/CMake/Templates/OGRE-Volume.pc.in -+++ b/CMake/Templates/OGRE-Volume.pc.in -@@ -3,9 +3,9 @@ exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include - --Name: OGRE-Volume -+Name: OGRE-Next-Volume - Description: Voxel based terrain component for OGRE - Version: @OGRE_VERSION@ --Requires: OGRE = @OGRE_VERSION@ --Libs: -L${libdir} -lOgreVolume@OGRE_LIB_SUFFIX@ --Cflags: -I${includedir}/OGRE/Volume @OGRE_CFLAGS@ -+Requires: OGRE-Next = @OGRE_VERSION@ -+Libs: -L${libdir} -lOgreNextVolume@OGRE_LIB_SUFFIX@ -+Cflags: -I${includedir}/OGRE-Next/Volume @OGRE_CFLAGS@ -diff --git a/CMake/Templates/OGRE.pc.in b/CMake/Templates/OGRE.pc.in -index 15e827f7ece..8149962c751 100644 ---- a/CMake/Templates/OGRE.pc.in -+++ b/CMake/Templates/OGRE.pc.in -@@ -2,11 +2,11 @@ prefix=@OGRE_PREFIX_PATH@ - exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include --plugindir=${libdir}/OGRE -+plugindir=${prefix}/@OGRE_PLUGIN_DIRECTORY@/OGRE-Next - --Name: OGRE -+Name: OGRE-Next - Description: Object-Oriented Graphics Rendering Engine - Version: @OGRE_VERSION@ - URL: http://www.ogre3d.org --Libs: -L${libdir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ --Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@ -+Libs: -L${libdir} -lOgreNextMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ -+Cflags: -I${includedir} -I${includedir}/OGRE-Next @OGRE_CFLAGS@ - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a3ae3cc..4599da2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "ogre-next" %} -{% set version = "2.3.1" %} +{% set version = "2.3.3" %} package: name: {{ name }} @@ -7,20 +7,15 @@ package: source: - url: https://github.com/OGRECave/ogre-next/archive/refs/tags/v{{ version }}.tar.gz - sha256: 38dd0d5ba5759ee47c71552c5dacf44dad5fe61868025dcbd5ea6a6bdb6bc8e4 + sha256: 92ce7765d892d6424df3d8d4a56a8fc0b2f4f91c216b1b1d5b231caa9abaaa38 patches: - - add_OGRE_USE_NEW_PROJECT_NAME_cmake_option.patch + - 0001-Add-option-to-force-pkg-config-on-Windows.patch + - 0002-Include-suffix-in-binary-install-paths-on-Windows.patch - disable_cmake_modules_install.patch - - change_header_install_from_OGRE_to_OGRE-Next.patch - - change_plugin_installs_from_OGRE_to_OGRE-Next.patch - - fix_pc_files_generation.patch - - backport_hlms_bugfix.patch - - add_suffix_in_install_also_for_runtime.patch - 351.patch - - 388.patch build: - number: 4 + number: 0 run_exports: # See https://salsa.debian.org/ogre-team/ogre-next/-/blob/a27f70cd8c6b82e3fc207fefe557b43bc49634b4/debian/README.Debian - {{ pin_subpackage(name, max_pin='x.x.x') }}