early-access version 2853
This commit is contained in:
pineappleEA
14
externals/vcpkg/ports/ogre/disable-dependency-qt.patch
vendored
Executable file
14
externals/vcpkg/ports/ogre/disable-dependency-qt.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
||||
index 068dd27..721121b 100644
|
||||
--- a/CMake/Dependencies.cmake
|
||||
+++ b/CMake/Dependencies.cmake
|
||||
@@ -346,7 +346,9 @@ if(NOT ANDROID AND NOT EMSCRIPTEN)
|
||||
)
|
||||
endif()
|
||||
|
||||
+ if (0)
|
||||
find_package(Qt5 COMPONENTS Core Gui QUIET)
|
||||
+ endif()
|
||||
macro_log_feature(Qt5_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/" FALSE "" "")
|
||||
endif()
|
||||
|
||||
36
externals/vcpkg/ports/ogre/fix-dependency.patch
vendored
Executable file
36
externals/vcpkg/ports/ogre/fix-dependency.patch
vendored
Executable file
@@ -0,0 +1,36 @@
|
||||
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
||||
index 2ae0b66..e6c55cd 100644
|
||||
--- a/CMake/Dependencies.cmake
|
||||
+++ b/CMake/Dependencies.cmake
|
||||
@@ -242,7 +242,7 @@ find_package(FreeImage)
|
||||
macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "")
|
||||
|
||||
# Find FreeType
|
||||
-find_package(Freetype)
|
||||
+find_package(freetype CONFIG REQUIRED)
|
||||
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
|
||||
|
||||
# Find X11
|
||||
@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET)
|
||||
macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "")
|
||||
|
||||
# pugixml
|
||||
-find_package(pugixml QUIET)
|
||||
+find_package(pugixml CONFIG REQUIRED)
|
||||
macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "")
|
||||
|
||||
# Assimp
|
||||
-find_package(ASSIMP QUIET)
|
||||
+find_package(assimp CONFIG REQUIRED)
|
||||
macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "")
|
||||
|
||||
if(ASSIMP_FOUND)
|
||||
@@ -336,7 +336,7 @@ endif()
|
||||
# Find sdl2
|
||||
if(NOT ANDROID AND NOT EMSCRIPTEN)
|
||||
# find script does not work in cross compilation environment
|
||||
- find_package(SDL2 QUIET)
|
||||
+ find_package(SDL2 CONFIG REQUIRED)
|
||||
macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "")
|
||||
if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
|
||||
add_library(SDL2::SDL2 INTERFACE IMPORTED)
|
||||
65
externals/vcpkg/ports/ogre/fix-findimgui.patch
vendored
Executable file
65
externals/vcpkg/ports/ogre/fix-findimgui.patch
vendored
Executable file
@@ -0,0 +1,65 @@
|
||||
diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
|
||||
index df8f32af4..42be1e8f2 100644
|
||||
--- a/Components/Overlay/CMakeLists.txt
|
||||
+++ b/Components/Overlay/CMakeLists.txt
|
||||
@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES
|
||||
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
|
||||
|
||||
if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
||||
- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
|
||||
- if(NOT EXISTS ${IMGUI_DIR})
|
||||
- message(STATUS "Dowloading imgui")
|
||||
- file(DOWNLOAD
|
||||
- https://github.com/ocornut/imgui/archive/v1.77.tar.gz
|
||||
- ${PROJECT_BINARY_DIR}/imgui.tar.gz)
|
||||
- execute_process(COMMAND ${CMAKE_COMMAND}
|
||||
- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||
- endif()
|
||||
- list(APPEND SOURCE_FILES
|
||||
- ${IMGUI_DIR}/imgui.cpp
|
||||
- ${IMGUI_DIR}/imgui_draw.cpp
|
||||
- ${IMGUI_DIR}/imgui_widgets.cpp
|
||||
- ${IMGUI_DIR}/imgui_demo.cpp
|
||||
- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp)
|
||||
+ find_package(imgui CONFIG REQUIRED)
|
||||
+ find_path(IMGUI_INCLUDE_DIR imgui.h)
|
||||
else()
|
||||
list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp")
|
||||
endif()
|
||||
@@ -41,13 +28,17 @@ endif()
|
||||
# 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)
|
||||
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
||||
+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui)
|
||||
+else()
|
||||
+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB)
|
||||
+endif()
|
||||
target_include_directories(OgreOverlay PUBLIC
|
||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||
$<INSTALL_INTERFACE:include/OGRE/Overlay>
|
||||
PRIVATE ${FREETYPE_INCLUDE_DIRS})
|
||||
|
||||
-if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
||||
+if(0)
|
||||
target_include_directories(OgreOverlay PUBLIC
|
||||
PUBLIC "$<BUILD_INTERFACE:${IMGUI_DIR}>"
|
||||
PRIVATE "$<BUILD_INTERFACE:${IMGUI_DIR}/misc/freetype>")
|
||||
diff --git "a/Components/Bites/CMakeLists.txt" "b/Components/Bites/CMakeLists.txt"
|
||||
index 5d58a8d74..fe41e4a28 100644
|
||||
--- "a/Components/Bites/CMakeLists.txt"
|
||||
+++ "b/Components/Bites/CMakeLists.txt"
|
||||
@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN)
|
||||
message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites")
|
||||
endif()
|
||||
|
||||
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
||||
+ find_package(imgui CONFIG REQUIRED)
|
||||
+ target_link_libraries(OgreBites PRIVATE imgui::imgui)
|
||||
+endif()
|
||||
+
|
||||
generate_export_header(OgreBites
|
||||
EXPORT_MACRO_NAME _OgreBitesExport
|
||||
EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h)
|
||||
|
||||
132
externals/vcpkg/ports/ogre/portfile.cmake
vendored
Executable file
132
externals/vcpkg/ports/ogre/portfile.cmake
vendored
Executable file
@@ -0,0 +1,132 @@
|
||||
if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
|
||||
message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
|
||||
endif()
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OGRECave/ogre
|
||||
REF 7d0c8181ac43ad20bdba326abbd3deeddf310f0b #v1.12.9
|
||||
SHA512 f223075f49a2465cd5070f5efa796aa715f3ea2fefd578e4ec0a11be2fd3330922849ed804e1df004209abafaa7b24ff42432dd79f336a56063e3cf38ae0e8c9
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
toolchain_fixes.patch
|
||||
fix-dependency.patch
|
||||
fix-findimgui.patch
|
||||
disable-dependency-qt.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
set(OGRE_STATIC ON)
|
||||
else()
|
||||
set(OGRE_STATIC OFF)
|
||||
endif()
|
||||
|
||||
# Configure features
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9
|
||||
java OGRE_BUILD_COMPONENT_JAVA
|
||||
python OGRE_BUILD_COMPONENT_PYTHON
|
||||
csharp OGRE_BUILD_COMPONENT_CSHARP
|
||||
overlay OGRE_BUILD_COMPONENT_OVERLAY
|
||||
zziplib OGRE_CONFIG_ENABLE_ZIP
|
||||
strict OGRE_RESOURCEMANAGER_STRICT
|
||||
)
|
||||
|
||||
# OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources
|
||||
string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
|
||||
string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DOGRE_BUILD_DEPENDENCIES=OFF
|
||||
-DOGRE_BUILD_SAMPLES=OFF
|
||||
-DOGRE_BUILD_TESTS=OFF
|
||||
-DOGRE_BUILD_TOOLS=OFF
|
||||
-DOGRE_BUILD_MSVC_MP=ON
|
||||
-DOGRE_BUILD_MSVC_ZM=ON
|
||||
-DOGRE_INSTALL_DEPENDENCIES=OFF
|
||||
-DOGRE_INSTALL_DOCS=OFF
|
||||
-DOGRE_INSTALL_PDB=OFF
|
||||
-DOGRE_INSTALL_SAMPLES=OFF
|
||||
-DOGRE_INSTALL_TOOLS=OFF
|
||||
-DOGRE_INSTALL_CMAKE=ON
|
||||
-DOGRE_INSTALL_VSPROPS=OFF
|
||||
-DOGRE_STATIC=${OGRE_STATIC}
|
||||
-DOGRE_CONFIG_THREAD_PROVIDER=std
|
||||
-DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GL=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
|
||||
-DFREETYPE_FOUND=ON
|
||||
-DOGRE_CMAKE_DIR=share/ogre
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg)
|
||||
if(REL_CFGS)
|
||||
file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
||||
file(REMOVE ${REL_CFGS})
|
||||
endif()
|
||||
|
||||
file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg)
|
||||
if(DBG_CFGS)
|
||||
file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
||||
file(REMOVE ${DBG_CFGS})
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
endif()
|
||||
|
||||
#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
|
||||
#manual-link subfolder is here to the rescue!
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib)
|
||||
else()
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib)
|
||||
endif()
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib)
|
||||
else()
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake)
|
||||
foreach(SHARE_FILE ${SHARE_FILES})
|
||||
file(READ "${SHARE_FILE}" _contents)
|
||||
string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
|
||||
file(WRITE "${SHARE_FILE}" "${_contents}")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg)
|
||||
foreach(file ${share_cfgs})
|
||||
vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..")
|
||||
endforeach()
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
265
externals/vcpkg/ports/ogre/toolchain_fixes.patch
vendored
Executable file
265
externals/vcpkg/ports/ogre/toolchain_fixes.patch
vendored
Executable file
@@ -0,0 +1,265 @@
|
||||
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
||||
index a7a3796..2e21403 100644
|
||||
--- a/CMake/CMakeLists.txt
|
||||
+++ b/CMake/CMakeLists.txt
|
||||
@@ -13,10 +13,12 @@
|
||||
# directory, but can also be used for custom projects.
|
||||
#############################################################
|
||||
|
||||
-if(WIN32 OR APPLE)
|
||||
- set(OGRE_CMAKE_DIR "CMake")
|
||||
-else()
|
||||
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
||||
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
||||
+ if(WIN32 OR APPLE)
|
||||
+ set(OGRE_CMAKE_DIR "CMake")
|
||||
+ else()
|
||||
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
set(INST_FILES Utils/FindPkgMacros.cmake)
|
||||
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
|
||||
index 06a055b..09d10bd 100644
|
||||
--- a/CMake/InstallResources.cmake
|
||||
+++ b/CMake/InstallResources.cmake
|
||||
@@ -204,10 +204,12 @@ endif ()
|
||||
# Create the CMake package files
|
||||
include(CMakePackageConfigHelpers)
|
||||
|
||||
-if(WIN32 OR APPLE)
|
||||
- set(OGRE_CMAKE_DIR "CMake")
|
||||
-else()
|
||||
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
||||
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
||||
+ if(WIN32 OR APPLE)
|
||||
+ set(OGRE_CMAKE_DIR "CMake")
|
||||
+ else()
|
||||
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
||||
+ endif()
|
||||
endif()
|
||||
if(WIN32)
|
||||
set(OGRE_PLUGIN_DIR_CMAKE "bin")
|
||||
diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake
|
||||
index 4501cf9..7eb57c3 100644
|
||||
--- a/CMake/Packages/FindCg.cmake
|
||||
+++ b/CMake/Packages/FindCg.cmake
|
||||
@@ -56,7 +56,7 @@ endif()
|
||||
|
||||
find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
-make_library_set(Cg_LIBRARY)
|
||||
+make_library_set(Cg)
|
||||
|
||||
if (WIN32)
|
||||
if (CMAKE_CL_64)
|
||||
diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
|
||||
index 7c89ec5..d8314f0 100644
|
||||
--- a/CMake/Packages/FindFreeImage.cmake
|
||||
+++ b/CMake/Packages/FindFreeImage.cmake
|
||||
@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
|
||||
find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
|
||||
-make_library_set(FreeImage_LIBRARY)
|
||||
+make_library_set(FreeImage)
|
||||
|
||||
findpkg_finish(FreeImage)
|
||||
|
||||
diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
index dd4b179..6f158fc 100644
|
||||
--- a/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
+++ b/CMake/Packages/FindGLSLOptimizer.cmake
|
||||
@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
|
||||
find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
|
||||
find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
-make_library_set(GLSL_Optimizer_LIBRARY)
|
||||
+make_library_set(GLSL_Optimizer)
|
||||
|
||||
findpkg_finish(GLSL_Optimizer)
|
||||
add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
|
||||
diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
index 7125895..13a306f 100644
|
||||
--- a/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
+++ b/CMake/Packages/FindHLSL2GLSL.cmake
|
||||
@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
|
||||
find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
|
||||
find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
-make_library_set(HLSL2GLSL_LIBRARY)
|
||||
+make_library_set(HLSL2GLSL)
|
||||
|
||||
findpkg_finish(HLSL2GLSL)
|
||||
add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
|
||||
diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
|
||||
index 95c70cd..893ce01 100644
|
||||
--- a/CMake/Packages/FindNVAPI.cmake
|
||||
+++ b/CMake/Packages/FindNVAPI.cmake
|
||||
@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
|
||||
find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
|
||||
find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
|
||||
find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
|
||||
-make_library_set(NVAPI_LIBRARY)
|
||||
+make_library_set(NVAPI)
|
||||
|
||||
findpkg_finish(NVAPI)
|
||||
add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
|
||||
\ No newline at end of file
|
||||
diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
|
||||
index 6b6d7fa..3667b8b 100644
|
||||
--- a/CMake/Packages/FindPOCO.cmake
|
||||
+++ b/CMake/Packages/FindPOCO.cmake
|
||||
@@ -50,7 +50,7 @@ findpkg_framework(POCO)
|
||||
find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
|
||||
find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_LIBRARY)
|
||||
+make_library_set(POCO)
|
||||
|
||||
findpkg_finish(POCO)
|
||||
|
||||
@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES)
|
||||
find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
|
||||
find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_Util_LIBRARY)
|
||||
+make_library_set(POCO_Util)
|
||||
findpkg_finish(POCO_Util)
|
||||
|
||||
# Look for Poco's Net package
|
||||
@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES)
|
||||
find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
|
||||
find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_Net_LIBRARY)
|
||||
+make_library_set(POCO_Net)
|
||||
findpkg_finish(POCO_Net)
|
||||
|
||||
# Look for Poco's NetSSL package
|
||||
@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
|
||||
find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
|
||||
find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_NetSSL_LIBRARY)
|
||||
+make_library_set(POCO_NetSSL)
|
||||
findpkg_finish(POCO_NetSSL)
|
||||
|
||||
# Look for Poco's XML package
|
||||
@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
|
||||
find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
|
||||
find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
||||
-make_library_set(POCO_XML_LIBRARY)
|
||||
+make_library_set(POCO_XML)
|
||||
findpkg_finish(POCO_XML)
|
||||
|
||||
diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
|
||||
index 0c48510..c121966 100644
|
||||
--- a/CMake/Packages/FindTBB.cmake
|
||||
+++ b/CMake/Packages/FindTBB.cmake
|
||||
@@ -104,7 +104,7 @@ findpkg_framework(TBB)
|
||||
find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
||||
find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
||||
find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
||||
-make_library_set(TBB_LIBRARY)
|
||||
+make_library_set(TBB)
|
||||
|
||||
findpkg_finish(TBB)
|
||||
|
||||
@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
|
||||
find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} )
|
||||
find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
||||
find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
||||
-make_library_set(TBB_MALLOC_LIBRARY)
|
||||
+make_library_set(TBB_MALLOC)
|
||||
findpkg_finish(TBB_MALLOC)
|
||||
|
||||
# Look for TBB's malloc proxy package
|
||||
@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
|
||||
find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
||||
find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
||||
find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
||||
-make_library_set(TBB_MALLOC_PROXY_LIBRARY)
|
||||
+make_library_set(TBB_MALLOC_PROXY)
|
||||
findpkg_finish(TBB_MALLOC_PROXY)
|
||||
diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake
|
||||
index e97951e..54c2567 100644
|
||||
--- a/CMake/Packages/FindZZip.cmake
|
||||
+++ b/CMake/Packages/FindZZip.cmake
|
||||
@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib)
|
||||
|
||||
findpkg_framework(ZZip)
|
||||
|
||||
-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
||||
+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
||||
|
||||
find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
||||
find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
||||
|
||||
-make_library_set(ZZip_LIBRARY)
|
||||
+make_library_set(ZZip)
|
||||
|
||||
findpkg_finish(ZZip)
|
||||
|
||||
diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
|
||||
index 374f84b..dc7066d 100644
|
||||
--- a/CMake/Utils/FindPkgMacros.cmake
|
||||
+++ b/CMake/Utils/FindPkgMacros.cmake
|
||||
@@ -79,15 +79,21 @@ endmacro (use_pkgconfig)
|
||||
|
||||
# Couple a set of release AND debug libraries (or frameworks)
|
||||
macro(make_library_set PREFIX)
|
||||
- if (${PREFIX}_FWK)
|
||||
- set(${PREFIX} ${${PREFIX}_FWK})
|
||||
- elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
|
||||
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
|
||||
- elseif (${PREFIX}_REL)
|
||||
- set(${PREFIX} ${${PREFIX}_REL})
|
||||
- elseif (${PREFIX}_DBG)
|
||||
- set(${PREFIX} ${${PREFIX}_DBG})
|
||||
- endif ()
|
||||
+ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
|
||||
+ set(PREFIX_LIB "${PREFIX}_LIBRARY")
|
||||
+ if (${PREFIX_LIB}_FWK)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK})
|
||||
+ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG)
|
||||
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "")
|
||||
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "")
|
||||
+ select_library_configurations(${PREFIX})
|
||||
+ elseif (${PREFIX_LIB}_REL)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL})
|
||||
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL})
|
||||
+ elseif (${PREFIX_LIB}_DBG)
|
||||
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG})
|
||||
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG})
|
||||
+ endif()
|
||||
endmacro(make_library_set)
|
||||
|
||||
# Generate debug names from given release names
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1602572..9fddbe7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -271,7 +271,7 @@ elseif(EMSCRIPTEN)
|
||||
elseif (APPLE AND NOT APPLE_IOS)
|
||||
|
||||
set(XCODE_ATTRIBUTE_SDKROOT macosx)
|
||||
- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
|
||||
+ if(1)
|
||||
execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
|
||||
string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
|
||||
else()
|
||||
diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt
|
||||
index e9c936a..bb8747e 100644
|
||||
--- a/PlugIns/EXRCodec/CMakeLists.txt
|
||||
+++ b/PlugIns/EXRCodec/CMakeLists.txt
|
||||
@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES})
|
||||
target_include_directories(Codec_EXR PUBLIC
|
||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||
$<INSTALL_INTERFACE:include/OGRE/Plugins/EXRCodec>)
|
||||
-target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR")
|
||||
+target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}")
|
||||
|
||||
ogre_config_framework(Codec_EXR)
|
||||
ogre_config_plugin(Codec_EXR)
|
||||
77
externals/vcpkg/ports/ogre/vcpkg.json
vendored
Executable file
77
externals/vcpkg/ports/ogre/vcpkg.json
vendored
Executable file
@@ -0,0 +1,77 @@
|
||||
{
|
||||
"name": "ogre",
|
||||
"version": "1.12.9",
|
||||
"port-version": 7,
|
||||
"description": "3D Object-Oriented Graphics Rendering Engine",
|
||||
"homepage": "https://github.com/OGRECave/ogre",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
"pugixml",
|
||||
"sdl2",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
],
|
||||
"default-features": [
|
||||
"assimp",
|
||||
"freeimage",
|
||||
"overlay",
|
||||
"zziplib"
|
||||
],
|
||||
"features": {
|
||||
"assimp": {
|
||||
"description": "Use assimp",
|
||||
"dependencies": [
|
||||
"assimp"
|
||||
]
|
||||
},
|
||||
"csharp": {
|
||||
"description": "Build csharp bindings"
|
||||
},
|
||||
"d3d9": {
|
||||
"description": "Build Direct3D9 RenderSystem"
|
||||
},
|
||||
"freeimage": {
|
||||
"description": "Build with FreeImage support",
|
||||
"dependencies": [
|
||||
"freeimage"
|
||||
]
|
||||
},
|
||||
"java": {
|
||||
"description": "Build Java (JNI) bindings"
|
||||
},
|
||||
"overlay": {
|
||||
"description": "Build overlay component",
|
||||
"dependencies": [
|
||||
"freetype",
|
||||
{
|
||||
"name": "imgui",
|
||||
"features": [
|
||||
"freetype"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"python": {
|
||||
"description": "Build Python bindings",
|
||||
"dependencies": [
|
||||
"python3"
|
||||
]
|
||||
},
|
||||
"strict": {
|
||||
"description": "Force Ogre resource manager to be strict with group names and resource names"
|
||||
},
|
||||
"zziplib": {
|
||||
"description": "Build with zziplib support (GPL)",
|
||||
"dependencies": [
|
||||
"zziplib"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user