🎉 Added ogre 1.12.13
This commit is contained in:
		
							
								
								
									
										173
									
								
								ogre/1.12/Findpugixml.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										173
									
								
								ogre/1.12/Findpugixml.cmake
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,173 @@ | ||||
|  | ||||
|  | ||||
| function(conan_message MESSAGE_OUTPUT) | ||||
|     if(NOT CONAN_CMAKE_SILENT_OUTPUT) | ||||
|         message(${ARGV${0}}) | ||||
|     endif() | ||||
| endfunction() | ||||
|  | ||||
|  | ||||
| macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS FRAMEWORKS_DIRS) | ||||
|     if(APPLE) | ||||
|         foreach(_FRAMEWORK ${FRAMEWORKS}) | ||||
|             # https://cmake.org/pipermail/cmake-developers/2017-August/030199.html | ||||
|             find_library(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND NAME ${_FRAMEWORK} PATHS ${FRAMEWORKS_DIRS} CMAKE_FIND_ROOT_PATH_BOTH) | ||||
|             if(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND) | ||||
|                 list(APPEND ${FRAMEWORKS_FOUND} ${CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND}) | ||||
|             else() | ||||
|                 message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${FRAMEWORKS_DIRS}") | ||||
|             endif() | ||||
|         endforeach() | ||||
|     endif() | ||||
| endmacro() | ||||
|  | ||||
|  | ||||
| function(conan_package_library_targets libraries package_libdir deps out_libraries out_libraries_target build_type package_name) | ||||
|     unset(_CONAN_ACTUAL_TARGETS CACHE) | ||||
|     unset(_CONAN_FOUND_SYSTEM_LIBS CACHE) | ||||
|     foreach(_LIBRARY_NAME ${libraries}) | ||||
|         find_library(CONAN_FOUND_LIBRARY NAME ${_LIBRARY_NAME} PATHS ${package_libdir} | ||||
|                      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) | ||||
|         if(CONAN_FOUND_LIBRARY) | ||||
|             conan_message(STATUS "Library ${_LIBRARY_NAME} found ${CONAN_FOUND_LIBRARY}") | ||||
|             list(APPEND _out_libraries ${CONAN_FOUND_LIBRARY}) | ||||
|             if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0") | ||||
|                 # Create a micro-target for each lib/a found | ||||
|                 string(REGEX REPLACE "[^A-Za-z0-9.+_-]" "_" _LIBRARY_NAME ${_LIBRARY_NAME}) | ||||
|                 set(_LIB_NAME CONAN_LIB::${package_name}_${_LIBRARY_NAME}${build_type}) | ||||
|                 if(NOT TARGET ${_LIB_NAME}) | ||||
|                     # Create a micro-target for each lib/a found | ||||
|                     add_library(${_LIB_NAME} UNKNOWN IMPORTED) | ||||
|                     set_target_properties(${_LIB_NAME} PROPERTIES IMPORTED_LOCATION ${CONAN_FOUND_LIBRARY}) | ||||
|                     set(_CONAN_ACTUAL_TARGETS ${_CONAN_ACTUAL_TARGETS} ${_LIB_NAME}) | ||||
|                 else() | ||||
|                     conan_message(STATUS "Skipping already existing target: ${_LIB_NAME}") | ||||
|                 endif() | ||||
|                 list(APPEND _out_libraries_target ${_LIB_NAME}) | ||||
|             endif() | ||||
|             conan_message(STATUS "Found: ${CONAN_FOUND_LIBRARY}") | ||||
|         else() | ||||
|             conan_message(STATUS "Library ${_LIBRARY_NAME} not found in package, might be system one") | ||||
|             list(APPEND _out_libraries_target ${_LIBRARY_NAME}) | ||||
|             list(APPEND _out_libraries ${_LIBRARY_NAME}) | ||||
|             set(_CONAN_FOUND_SYSTEM_LIBS "${_CONAN_FOUND_SYSTEM_LIBS};${_LIBRARY_NAME}") | ||||
|         endif() | ||||
|         unset(CONAN_FOUND_LIBRARY CACHE) | ||||
|     endforeach() | ||||
|  | ||||
|     if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0") | ||||
|         # Add all dependencies to all targets | ||||
|         string(REPLACE " " ";" deps_list "${deps}") | ||||
|         foreach(_CONAN_ACTUAL_TARGET ${_CONAN_ACTUAL_TARGETS}) | ||||
|             set_property(TARGET ${_CONAN_ACTUAL_TARGET} PROPERTY INTERFACE_LINK_LIBRARIES "${_CONAN_FOUND_SYSTEM_LIBS};${deps_list}") | ||||
|         endforeach() | ||||
|     endif() | ||||
|  | ||||
|     set(${out_libraries} ${_out_libraries} PARENT_SCOPE) | ||||
|     set(${out_libraries_target} ${_out_libraries_target} PARENT_SCOPE) | ||||
| endfunction() | ||||
|  | ||||
|  | ||||
| include(FindPackageHandleStandardArgs) | ||||
|  | ||||
| conan_message(STATUS "Conan: Using autogenerated Findpugixml.cmake") | ||||
| # Global approach | ||||
| set(pugixml_FOUND 1) | ||||
| set(pugixml_VERSION "1.11") | ||||
|  | ||||
| find_package_handle_standard_args(pugixml REQUIRED_VARS | ||||
|                                   pugixml_VERSION VERSION_VAR pugixml_VERSION) | ||||
| mark_as_advanced(pugixml_FOUND pugixml_VERSION) | ||||
|  | ||||
|  | ||||
| set(pugixml_INCLUDE_DIRS "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/include") | ||||
| set(pugixml_INCLUDE_DIR "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/include") | ||||
| set(pugixml_INCLUDES "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/include") | ||||
| set(pugixml_RES_DIRS ) | ||||
| set(pugixml_DEFINITIONS ) | ||||
| set(pugixml_LINKER_FLAGS_LIST | ||||
|         "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:>" | ||||
|         "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY>:>" | ||||
|         "$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:>" | ||||
| ) | ||||
| set(pugixml_COMPILE_DEFINITIONS ) | ||||
| set(pugixml_COMPILE_OPTIONS_LIST "" "") | ||||
| set(pugixml_COMPILE_OPTIONS_C "") | ||||
| set(pugixml_COMPILE_OPTIONS_CXX "") | ||||
| set(pugixml_LIBRARIES_TARGETS "") # Will be filled later, if CMake 3 | ||||
| set(pugixml_LIBRARIES "") # Will be filled later | ||||
| set(pugixml_LIBS "") # Same as pugixml_LIBRARIES | ||||
| set(pugixml_SYSTEM_LIBS ) | ||||
| set(pugixml_FRAMEWORK_DIRS ) | ||||
| set(pugixml_FRAMEWORKS ) | ||||
| set(pugixml_FRAMEWORKS_FOUND "") # Will be filled later | ||||
| set(pugixml_BUILD_MODULES_PATHS ) | ||||
|  | ||||
| conan_find_apple_frameworks(pugixml_FRAMEWORKS_FOUND "${pugixml_FRAMEWORKS}" "${pugixml_FRAMEWORK_DIRS}") | ||||
|  | ||||
| mark_as_advanced(pugixml_INCLUDE_DIRS | ||||
|                  pugixml_INCLUDE_DIR | ||||
|                  pugixml_INCLUDES | ||||
|                  pugixml_DEFINITIONS | ||||
|                  pugixml_LINKER_FLAGS_LIST | ||||
|                  pugixml_COMPILE_DEFINITIONS | ||||
|                  pugixml_COMPILE_OPTIONS_LIST | ||||
|                  pugixml_LIBRARIES | ||||
|                  pugixml_LIBS | ||||
|                  pugixml_LIBRARIES_TARGETS) | ||||
|  | ||||
| # Find the real .lib/.a and add them to pugixml_LIBS and pugixml_LIBRARY_LIST | ||||
| set(pugixml_LIBRARY_LIST pugixml) | ||||
| set(pugixml_LIB_DIRS "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/lib") | ||||
|  | ||||
| # Gather all the libraries that should be linked to the targets (do not touch existing variables): | ||||
| set(_pugixml_DEPENDENCIES "${pugixml_FRAMEWORKS_FOUND} ${pugixml_SYSTEM_LIBS} ") | ||||
|  | ||||
| conan_package_library_targets("${pugixml_LIBRARY_LIST}"  # libraries | ||||
|                               "${pugixml_LIB_DIRS}"      # package_libdir | ||||
|                               "${_pugixml_DEPENDENCIES}"  # deps | ||||
|                               pugixml_LIBRARIES            # out_libraries | ||||
|                               pugixml_LIBRARIES_TARGETS    # out_libraries_targets | ||||
|                               ""                          # build_type | ||||
|                               "pugixml")                                      # package_name | ||||
|  | ||||
| set(pugixml_LIBS ${pugixml_LIBRARIES}) | ||||
|  | ||||
| foreach(_FRAMEWORK ${pugixml_FRAMEWORKS_FOUND}) | ||||
|     list(APPEND pugixml_LIBRARIES_TARGETS ${_FRAMEWORK}) | ||||
|     list(APPEND pugixml_LIBRARIES ${_FRAMEWORK}) | ||||
| endforeach() | ||||
|  | ||||
| foreach(_SYSTEM_LIB ${pugixml_SYSTEM_LIBS}) | ||||
|     list(APPEND pugixml_LIBRARIES_TARGETS ${_SYSTEM_LIB}) | ||||
|     list(APPEND pugixml_LIBRARIES ${_SYSTEM_LIB}) | ||||
| endforeach() | ||||
|  | ||||
| # We need to add our requirements too | ||||
| set(pugixml_LIBRARIES_TARGETS "${pugixml_LIBRARIES_TARGETS};") | ||||
| set(pugixml_LIBRARIES "${pugixml_LIBRARIES};") | ||||
|  | ||||
| set(CMAKE_MODULE_PATH "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/" ${CMAKE_MODULE_PATH}) | ||||
| set(CMAKE_PREFIX_PATH "/home/codespace/.conan/data/pugixml/1.11/_/_/package/b911f48570f9bb2902d9e83b2b9ebf9d376c8c56/" ${CMAKE_PREFIX_PATH}) | ||||
|  | ||||
| if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0") | ||||
|     # Target approach | ||||
|     if(NOT TARGET pugixml::pugixml) | ||||
|         add_library(pugixml::pugixml INTERFACE IMPORTED) | ||||
|         if(pugixml_INCLUDE_DIRS) | ||||
|             set_target_properties(pugixml::pugixml PROPERTIES INTERFACE_INCLUDE_DIRECTORIES | ||||
|                                   "${pugixml_INCLUDE_DIRS}") | ||||
|         endif() | ||||
|         set_property(TARGET pugixml::pugixml PROPERTY INTERFACE_LINK_LIBRARIES | ||||
|                      "${pugixml_LIBRARIES_TARGETS};${pugixml_LINKER_FLAGS_LIST}") | ||||
|         set_property(TARGET pugixml::pugixml PROPERTY INTERFACE_COMPILE_DEFINITIONS | ||||
|                      ${pugixml_COMPILE_DEFINITIONS}) | ||||
|         set_property(TARGET pugixml::pugixml PROPERTY INTERFACE_COMPILE_OPTIONS | ||||
|                      "${pugixml_COMPILE_OPTIONS_LIST}") | ||||
|          | ||||
|     endif() | ||||
| endif() | ||||
|  | ||||
| foreach(_BUILD_MODULE_PATH ${pugixml_BUILD_MODULES_PATHS}) | ||||
|     include(${_BUILD_MODULE_PATH}) | ||||
| endforeach() | ||||
							
								
								
									
										17
									
								
								ogre/1.12/conandata.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								ogre/1.12/conandata.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | ||||
| sources: | ||||
|   "1.12.13": | ||||
|     url: "https://github.com/OGRECave/ogre/archive/refs/tags/v1.12.13.tar.gz" | ||||
|     sha256: "b01ec30e7866b3140fc487eb828d92968d6aadc86254ad761a6bcac0f8b8a27f" | ||||
| patches: | ||||
|   "1.12.13": | ||||
|     - patch_file: "patches/1.12.13/CMakeLists.txt.patch" | ||||
|     - patch_file: "patches/1.12.13/AddLibPNG.patch" | ||||
|     - patch_file: "patches/1.12.13/pugixml-fix.patch" | ||||
|     - patch_file: "patches/1.12.13/FindPkgMacros.cmake.patch" | ||||
| requirements: | ||||
|   - "zlib/[1.x]" | ||||
|   - "zziplib/[0.13.x]" | ||||
|   - "freetype/[2.x]" | ||||
|   - "freeimage/[3.x]@anotherfoxguy/stable" | ||||
|   - "cg-toolkit/3.1@anotherfoxguy/stable" | ||||
|   - "pugixml/[1.x]" | ||||
							
								
								
									
										72
									
								
								ogre/1.12/conanfile.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										72
									
								
								ogre/1.12/conanfile.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,72 @@ | ||||
| from conans import ConanFile, CMake, tools | ||||
| from conans.tools import os_info, SystemPackageTool | ||||
|  | ||||
|  | ||||
| class OGREConan(ConanFile): | ||||
|     name = "ogre3d" | ||||
|     license = "MIT" | ||||
|     url = "https://github.com/AnotherFoxGuy/conan-OGRE" | ||||
|     description = "scene-oriented, flexible 3D engine written in C++" | ||||
|     settings = "os", "compiler", "build_type", "arch" | ||||
|     generators = "cmake_paths", "cmake_find_package" | ||||
|     exports_sources = "patches/**" | ||||
|  | ||||
|     def requirements(self): | ||||
|         for req in self.conan_data["requirements"]: | ||||
|             self.requires(req) | ||||
|  | ||||
|     def system_requirements(self): | ||||
|         if os_info.is_linux: | ||||
|             if os_info.with_apt: | ||||
|                 installer = SystemPackageTool() | ||||
|                 installer.install("libx11-dev") | ||||
|                 installer.install("libxaw7-dev") | ||||
|  | ||||
|     def source(self): | ||||
|         tools.get(**self.conan_data["sources"][self.version], strip_root=True) | ||||
|         for patch in self.conan_data["patches"][self.version]: | ||||
|             tools.patch(**patch) | ||||
|  | ||||
|     def build(self): | ||||
|         cmake = CMake(self) | ||||
|         cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" | ||||
|         cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON" | ||||
|         cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON" | ||||
|         cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON" | ||||
|         cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" | ||||
|         cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 | ||||
|         cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" | ||||
|         cmake.definitions["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF" | ||||
|         if os_info.is_windows: | ||||
|             cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" | ||||
|         cmake.configure() | ||||
|         cmake.build() | ||||
|  | ||||
|     def package(self): | ||||
|         cmake = CMake(self) | ||||
|         cmake.install() | ||||
|  | ||||
|     def package_info(self): | ||||
|         self.cpp_info.includedirs = [ | ||||
|             "include", | ||||
|             "include/OGRE", | ||||
|             "include/OGRE/Bites", | ||||
|             "include/OGRE/HLMS", | ||||
|             "include/OGRE/MeshLodGenerator", | ||||
|             "include/OGRE/Overlay", | ||||
|             "include/OGRE/Paging", | ||||
|             "include/OGRE/Plugins", | ||||
|             "include/OGRE/Property", | ||||
|             "include/OGRE/RenderSystems", | ||||
|             "include/OGRE/RTShaderSystem", | ||||
|             "include/OGRE/Terrain", | ||||
|             "include/OGRE/Threading", | ||||
|             "include/OGRE/Volume", | ||||
|         ] | ||||
|         self.cpp_info.libs = tools.collect_libs(self) | ||||
							
								
								
									
										32
									
								
								ogre/1.12/patches/1.12.13/AddLibPNG.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								ogre/1.12/patches/1.12.13/AddLibPNG.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,32 @@ | ||||
| --- Components/Overlay/CMakeLists.txt | ||||
| +++ Components/Overlay/CMakeLists.txt | ||||
| @@ -11,6 +11,20 @@ | ||||
|  # Overlay optional component | ||||
|  ############################################################ | ||||
|   | ||||
| +# FreeType from conan has seperate libraries | ||||
| +find_package(PNG) | ||||
| +find_package(BZip2) | ||||
| + | ||||
| +find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) | ||||
| +find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) | ||||
| + | ||||
| +if(NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLICOMMON_LIBRARY-NOTFOUND" AND NOT ${BROTLIDEC_LIBRARY} STREQUAL "BROTLIDEC_LIBRARY-NOTFOUND") | ||||
| +  set(BROTLI_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}) | ||||
| +  message(STATUS "Brotli libraries found: ${BROTLI_LIBRARIES}") | ||||
| +else() | ||||
| +  message(WARNING "Brotli library not found: ${BROTLICOMMON_LIBRARY} ${BROTLIDEC_LIBRARY}") | ||||
| +endif() | ||||
| + | ||||
|  # define header and source files for the library | ||||
|  file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") | ||||
|  list(APPEND HEADER_FILES  | ||||
| @@ -41,7 +55,7 @@ | ||||
|  # setup target | ||||
|  add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) | ||||
|  set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) | ||||
| -target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) | ||||
| +target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE Freetype::Freetype ${PNG_LIBRARIES} ${BZIP2_LIBRARIES} ${BROTLI_LIBRARIES} ZLIB::ZLIB) | ||||
|  target_include_directories(OgreOverlay PUBLIC  | ||||
|    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" | ||||
|    $<INSTALL_INTERFACE:include/OGRE/Overlay> | ||||
							
								
								
									
										19
									
								
								ogre/1.12/patches/1.12.13/CMakeLists.txt.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								ogre/1.12/patches/1.12.13/CMakeLists.txt.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | ||||
| --- CMakeLists.txt       | ||||
| +++ CMakeLists.txt | ||||
| @@ -20,6 +20,8 @@ | ||||
|  set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||||
|  set(CMAKE_CXX_EXTENSIONS OFF) | ||||
|   | ||||
| +include(${CMAKE_BINARY_DIR}/conan_paths.cmake) | ||||
| + | ||||
|  if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android") | ||||
|  	set(CMAKE_LINK_LIBRARY_FLAG "") | ||||
|  endif() | ||||
| @@ -74,6 +76,7 @@ | ||||
|    "${PROJECT_SOURCE_DIR}/CMake" | ||||
|    "${PROJECT_SOURCE_DIR}/CMake/Utils" | ||||
|    "${PROJECT_SOURCE_DIR}/CMake/Packages" | ||||
| +  "${CMAKE_BINARY_DIR}" | ||||
|  ) | ||||
|   | ||||
|  include(CMakeDependentOption) | ||||
							
								
								
									
										20
									
								
								ogre/1.12/patches/1.12.13/Dependencies.cmake.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								ogre/1.12/patches/1.12.13/Dependencies.cmake.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | ||||
| --- CMake/Dependencies.cmake | ||||
| +++ CMake/Dependencies.cmake | ||||
| @@ -13,7 +13,7 @@ | ||||
|   | ||||
|  # OGRE_DEPENDENCIES_DIR can be used to specify a single base | ||||
|  # folder where the required dependencies may be found. | ||||
| -set(OGRE_DEPENDENCIES_DIR "${PROJECT_BINARY_DIR}/Dependencies" CACHE PATH "Path to prebuilt OGRE dependencies") | ||||
| +set(OGRE_DEPENDENCIES_DIR ${CMAKE_PREFIX_PATH}) | ||||
|  option(OGRE_BUILD_DEPENDENCIES "automatically build Ogre Dependencies (SDL2, pugixml)" TRUE) | ||||
|   | ||||
|  message(STATUS "DEPENDENCIES_DIR: ${OGRE_DEPENDENCIES_DIR}") | ||||
| @@ -68,7 +68,7 @@ | ||||
|  set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${OGRE_DEP_SEARCH_PATH}) | ||||
|  set(CMAKE_FRAMEWORK_PATH ${CMAKE_FRAMEWORK_PATH} ${OGRE_DEP_SEARCH_PATH}) | ||||
|   | ||||
| -if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) | ||||
| +if(0) | ||||
|      message(STATUS "Building pugixml") | ||||
|      file(DOWNLOAD | ||||
|          https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz | ||||
							
								
								
									
										11
									
								
								ogre/1.12/patches/1.12.13/FindPkgMacros.cmake.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								ogre/1.12/patches/1.12.13/FindPkgMacros.cmake.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | ||||
| --- CMake/Utils/FindPkgMacros.cmake | ||||
| +++ CMake/Utils/FindPkgMacros.cmake | ||||
| @@ -82,7 +82,7 @@ | ||||
|    if (${PREFIX}_FWK) | ||||
|      set(${PREFIX} ${${PREFIX}_FWK}) | ||||
|    elseif (${PREFIX}_REL AND ${PREFIX}_DBG) | ||||
| -    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) | ||||
| +    set(${PREFIX} "$<$<CONFIG:Debug>:${${PREFIX}_DBG}>$<$<NOT:$<CONFIG:Debug>>:${${PREFIX}_REL}>") | ||||
|    elseif (${PREFIX}_REL) | ||||
|      set(${PREFIX} ${${PREFIX}_REL}) | ||||
|    elseif (${PREFIX}_DBG) | ||||
							
								
								
									
										15
									
								
								ogre/1.12/patches/1.12.13/pugixml-fix.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								ogre/1.12/patches/1.12.13/pugixml-fix.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| --- Tools/XMLConverter/CMakeLists.txt | ||||
| +++ Tools/XMLConverter/CMakeLists.txt | ||||
| @@ -21,9 +21,10 @@ | ||||
|    src/OgreXMLSkeletonSerializer.cpp | ||||
|  ) | ||||
|   | ||||
| +message("Fixing OgreXMLConverter") | ||||
|  add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES}) | ||||
| -target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) | ||||
| -target_link_libraries(OgreXMLConverter OgreMain pugixml) | ||||
| +target_include_directories(OgreXMLConverter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${pugixml_INCLUDE_DIRS}) | ||||
| +target_link_libraries(OgreXMLConverter OgreMain pugixml::pugixml) | ||||
|   | ||||
|  if (OGRE_PROJECT_FOLDERS) | ||||
|  	set_property(TARGET OgreXMLConverter PROPERTY FOLDER Tools) | ||||
| @@ -2,4 +2,6 @@ versions: | ||||
|   "1.11.6.1": | ||||
|     folder: "1.11" | ||||
|   "13.0.0": | ||||
|     folder: "13" | ||||
|     folder: "13" | ||||
|   "1.12.13": | ||||
|     folder: "1.12" | ||||
		Reference in New Issue
	
	Block a user