🐛 Fixed OGRE plugin compatibility
This commit is contained in:
parent
4e871901dc
commit
44cda183ed
2
build.py
2
build.py
@ -38,4 +38,4 @@ data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run(
|
|||||||
['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split()))
|
['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split()))
|
||||||
|
|
||||||
for d in data:
|
for d in data:
|
||||||
system(f"conan upload {d} -r ror-v2 --all")
|
system(f"conan upload {d} -r ror-v2 --all")
|
@ -1,8 +1,13 @@
|
|||||||
sources:
|
sources:
|
||||||
"0.6.4":
|
"0.6.3":
|
||||||
url: "https://github.com/OGRECave/ogre-caelum/archive/94913d2040a41148c14001c33a0bdc0f100842f8.zip"
|
url: "https://github.com/OGRECave/ogre-caelum/archive/94913d2040a41148c14001c33a0bdc0f100842f8.zip"
|
||||||
sha256: "9de4159ae8050fd0858b3c1c09005aa50b36079a3a06accfb67203669be9a09e"
|
sha256: "9de4159ae8050fd0858b3c1c09005aa50b36079a3a06accfb67203669be9a09e"
|
||||||
|
"0.6.4":
|
||||||
|
url: "https://github.com/OGRECave/ogre-caelum/archive/115eecc6ff347d64aed289e4114fb9efc2a81cf6.zip"
|
||||||
|
sha256: "d218ed22fa9c32eabe217f59792894a8eb45d79757187d2293809aba5cf5b339"
|
||||||
patches:
|
patches:
|
||||||
|
"0.6.3":
|
||||||
|
- patch_file: "patches/0.6.3/CMakeLists.txt.patch"
|
||||||
"0.6.4":
|
"0.6.4":
|
||||||
- patch_file: "patches/0.6.4/CMakeLists.txt.patch"
|
- patch_file: "patches/0.6.4/CMakeLists.txt.patch"
|
||||||
requirements:
|
requirements:
|
||||||
|
20
ogre-caelum/all/patches/0.6.3/CMakeLists.txt.patch
Normal file
20
ogre-caelum/all/patches/0.6.3/CMakeLists.txt.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- CMakeLists.txt
|
||||||
|
+++ CMakeLists.txt
|
||||||
|
@@ -7,7 +7,7 @@
|
||||||
|
# cmake system for Caelum updated on 6-10-2017 by Edgar{at}AnotherFoxGuy{DOT}com
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.0.2)
|
||||||
|
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
|
|
||||||
|
# add some functions we use that are shipped with cmake
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
|
||||||
|
SET(CMAKE_USE_RELATIVE_PATHS OFF)
|
||||||
|
|
||||||
|
-find_package(OGRE REQUIRED CONFIG)
|
||||||
|
+find_package(OGRE REQUIRED)
|
||||||
|
link_directories(${OGRE_LIBRARY_DIRS})
|
||||||
|
|
||||||
|
# setup paths
|
@ -1,29 +1,11 @@
|
|||||||
--- CMakeLists.txt
|
--- CMakeLists.txt
|
||||||
+++ CMakeLists.txt
|
+++ CMakeLists.txt
|
||||||
@@ -7,7 +7,7 @@
|
@@ -7,7 +7,7 @@
|
||||||
# cmake system for Caelum updated on 6-10-2017 by Edgar{at}AnotherFoxGuy{DOT}com
|
# cmake system for Caelum updated on 2-9-2021 by Edgar{at}AnotherFoxGuy{DOT}com
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.0.2)
|
cmake_minimum_required(VERSION 3.0.2)
|
||||||
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake)
|
+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
|
|
||||||
# add some functions we use that are shipped with cmake
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
INCLUDE(CheckCSourceCompiles)
|
|
||||||
|
|
||||||
# define the project
|
# define the project
|
||||||
-project(Caelum VERSION 0.6.3)
|
project(
|
||||||
+project(Caelum VERSION 0.6.4)
|
|
||||||
|
|
||||||
# some versioning things
|
|
||||||
SET(LIB_MAJOR_VERSION ${Caelum_VERSION_MAJOR})
|
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
|
|
||||||
SET(CMAKE_USE_RELATIVE_PATHS OFF)
|
|
||||||
|
|
||||||
-find_package(OGRE REQUIRED CONFIG)
|
|
||||||
+find_package(OGRE REQUIRED)
|
|
||||||
link_directories(${OGRE_LIBRARY_DIRS})
|
|
||||||
|
|
||||||
# setup paths
|
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
versions:
|
versions:
|
||||||
|
"0.6.3":
|
||||||
|
folder: all
|
||||||
"0.6.4":
|
"0.6.4":
|
||||||
folder: all
|
folder: all
|
||||||
|
@ -1,9 +1,14 @@
|
|||||||
sources:
|
sources:
|
||||||
"1.2.1":
|
"1.2.0":
|
||||||
url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/7c9295f771e8c7973efc04d53283978ccd44fc9b.zip"
|
url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/7c9295f771e8c7973efc04d53283978ccd44fc9b.zip"
|
||||||
sha256: "513043eecf1aaf6f8b2335c953b0664128aa492007fe3d93068e5f4be436093a"
|
sha256: "513043eecf1aaf6f8b2335c953b0664128aa492007fe3d93068e5f4be436093a"
|
||||||
|
"1.3.0":
|
||||||
|
url: "https://github.com/OGRECave/ogre-pagedgeometry/archive/18ca8a0abd26cb5d52b99ad8e8fa0c8f7e6e7d79.zip"
|
||||||
|
sha256: "4a3d97d75f7417208403bd0f5e8c3b010ae0dd9a36968f78ecc5cd0161b2ddb9"
|
||||||
patches:
|
patches:
|
||||||
"1.2.1":
|
"1.2.0":
|
||||||
- patch_file: "patches/1.2.1/CMakeLists.txt.patch"
|
- patch_file: "patches/1.2.0/CMakeLists.txt.patch"
|
||||||
|
"1.3.0":
|
||||||
|
- patch_file: "patches/1.3.0/CMakeLists.txt.patch"
|
||||||
requirements:
|
requirements:
|
||||||
- "ogre3d/[1.x]@anotherfoxguy/stable"
|
- "ogre3d/[1.x]@anotherfoxguy/stable"
|
11
ogre-pagedgeometry/all/patches/1.2.0/CMakeLists.txt.patch
Normal file
11
ogre-pagedgeometry/all/patches/1.2.0/CMakeLists.txt.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- CMakeLists.txt
|
||||||
|
+++ CMakeLists.txt
|
||||||
|
@@ -7,7 +7,7 @@
|
||||||
|
# cmake system for PagedGeometry updated on 6-10-2017 by Edgar{at}AnotherFoxGuy{DOT}com
|
||||||
|
|
||||||
|
cmake_minimum_required( VERSION 3.0.2 )
|
||||||
|
-set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
|
||||||
|
+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake )
|
||||||
|
|
||||||
|
|
||||||
|
# add some functions we use that are shipped with cmake
|
@ -1,20 +0,0 @@
|
|||||||
--- CMakeLists.txt
|
|
||||||
+++ CMakeLists.txt
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
# cmake system for PagedGeometry updated on 6-10-2017 by Edgar{at}AnotherFoxGuy{DOT}com
|
|
||||||
|
|
||||||
cmake_minimum_required( VERSION 3.0.2 )
|
|
||||||
-set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
|
|
||||||
+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake )
|
|
||||||
|
|
||||||
|
|
||||||
# add some functions we use that are shipped with cmake
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
# some versioning things
|
|
||||||
SET(LIB_MAJOR_VERSION "1")
|
|
||||||
SET(LIB_MINOR_VERSION "2")
|
|
||||||
-SET(LIB_BUILD_VERSION "0")
|
|
||||||
+SET(LIB_BUILD_VERSION "1")
|
|
||||||
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_BUILD_VERSION}")
|
|
||||||
IF(NOT DEFINED LIB_INSTALL_DIR)
|
|
||||||
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
|
|
20
ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch
Normal file
20
ogre-pagedgeometry/all/patches/1.3.0/CMakeLists.txt.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- CMakeLists.txt
|
||||||
|
+++ CMakeLists.txt
|
||||||
|
@@ -7,7 +7,7 @@
|
||||||
|
# cmake system for PagedGeometry updated on 2-9-2021 by Edgar{at}AnotherFoxGuy{DOT}com
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.0.2)
|
||||||
|
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
|
# define the project
|
||||||
|
project(
|
||||||
|
@@ -101,7 +101,7 @@
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
|
# --- Ogre 3D graphics engine ---
|
||||||
|
-find_package(OGRE REQUIRED CONFIG)
|
||||||
|
+find_package(OGRE REQUIRED)
|
||||||
|
|
||||||
|
# now add the directories
|
||||||
|
add_subdirectory(source)
|
@ -1,3 +1,5 @@
|
|||||||
versions:
|
versions:
|
||||||
"1.2.1":
|
"1.2.0":
|
||||||
|
folder: all
|
||||||
|
"1.3.0":
|
||||||
folder: all
|
folder: all
|
||||||
|
Loading…
x
Reference in New Issue
Block a user