Merge pull request #4894 from twMr7/ogre_update_1113

[Ogre] update to 1.11.3

ports/ogre/001-cmake-install-dir.patch

@@ -1,5 +1,5 @@
---- a/cmake/CMakeLists.txt
+--- a/CMake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
++++ b/CMake/CMakeLists.txt
 @@ -13,10 +13,12 @@
  # directory, but can also be used for custom projects.
  #############################################################
@@ -8,7 +8,7 @@
 -	set(OGRE_CMAKE_DIR "CMake")
 -else()
 -	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
-+if (NOT DEFINED OGRE_CMAKE_DIR)
++if(NOT DEFINED OGRE_CMAKE_DIR)
 +  if(WIN32 OR APPLE)
 +    set(OGRE_CMAKE_DIR "CMake")
 +  else()
@@ -16,10 +16,10 @@
 +  endif()
  endif()
  
- set(INST_FILES
+ set(INST_FILES Utils/FindPkgMacros.cmake) 
---- a/cmake/InstallResources.cmake
+--- a/CMake/InstallResources.cmake
-+++ b/cmake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
-@@ -241,10 +241,12 @@ endif ()
+@@ -242,10 +242,12 @@
  # Create the CMake package files
  include(CMakePackageConfigHelpers)
  
@@ -27,7 +27,7 @@
 -  set(OGRE_CMAKE_DIR "CMake")
 -else()
 -  set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
-+if (NOT DEFINED OGRE_CMAKE_DIR)
++if(NOT DEFINED OGRE_CMAKE_DIR)
 +  if(WIN32 OR APPLE)
 +    set(OGRE_CMAKE_DIR "CMake")
 +  else()

ports/ogre/002-link-optimized-lib-workaround.patch

@@ -0,0 +1,37 @@
+--- a/CMake/Dependencies.cmake
++++ b/CMake/Dependencies.cmake
+@@ -199,6 +199,11 @@
+ # Find zlib
+ find_package(ZLIB)
+ macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "")
++# replace optimized/debug keyword with generator expression
++unset(ZLIB_LIBRARY)
++set(ZLIB_LIBRARY $<$<CONFIG:Release>:${ZLIB_LIBRARY_RELEASE}> $<$<CONFIG:Debug>:${ZLIB_LIBRARY_DEBUG}>)
++unset(ZLIB_LIBRARIES)
++set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+ 
+ if (ZLIB_FOUND)
+   # Find zziplib
+@@ -213,6 +218,11 @@
+ # Find FreeType
+ find_package(Freetype)
+ macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
++# replace optimized/debug keyword with generator expression
++unset(FREETYPE_LIBRARY)
++set(FREETYPE_LIBRARY $<$<CONFIG:Release>:${FREETYPE_LIBRARY_RELEASE}> $<$<CONFIG:Debug>:${FREETYPE_LIBRARY_DEBUG}>)
++unset(FREETYPE_LIBRARIES)
++set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
+ 
+ # Find X11
+ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN)
+--- src.orig/CMake/Utils/FindPkgMacros.cmake
++++ src.new/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:Release>:${${PREFIX}_REL}> $<$<CONFIG:Debug>:${${PREFIX}_DBG}>)
+   elseif (${PREFIX}_REL)
+     set(${PREFIX} ${${PREFIX}_REL})
+   elseif (${PREFIX}_DBG)

ports/ogre/CONTROL

@@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.10.11
+Version: 1.11.3-3
 Build-Depends: freeimage, freetype, zlib, zziplib
 Description: 3D Object-Oriented Graphics Rendering Engine
 

ports/ogre/portfile.cmake

@@ -3,15 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre
-    REF v1.10.11
+    REF v1.11.3
-    SHA512 2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900
+    SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/001-cmake-install-dir.patch"
+        001-cmake-install-dir.patch
+        002-link-optimized-lib-workaround.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -58,10 +55,7 @@ vcpkg_configure_cmake(
         -DOGRE_INSTALL_CMAKE=ON
         -DOGRE_INSTALL_VSPROPS=OFF
         -DOGRE_STATIC=${OGRE_STATIC}
-        -DOGRE_UNITY_BUILD=OFF
-        -DOGRE_USE_STD11=ON
         -DOGRE_CONFIG_THREAD_PROVIDER=std
-        -DOGRE_NODE_STORAGE_LEGACY=OFF
         -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
         -DOGRE_BUILD_RENDERSYSTEM_GL=ON
         -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
@@ -95,33 +89,31 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        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()
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        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 MAIN_REL ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib)
+    file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake)
-file(COPY ${MAIN_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
+    foreach(SHARE_FILE ${SHARE_FILES})
-file(GLOB MAIN_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib)
+        file(READ "${SHARE_FILE}" _contents)
-file(COPY ${MAIN_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
+        string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
-file(REMOVE ${MAIN_REL} ${MAIN_DBG})
+        file(WRITE "${SHARE_FILE}" "${_contents}")
-
+    endforeach()
-# Ogre installs custom cmake config files which don't follow the normal pattern.
+endif()
-# This normally makes them completely incompatible with multi-config generators, but with some effort it can be done.
-file(READ "${CURRENT_PACKAGES_DIR}/share/ogre/OGREConfig.cmake" _contents)
-string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${PACKAGE_PREFIX_DIR}" _contents "${_contents}")
-string(REPLACE "SDL2main.lib" "SDL2main$<$<CONFIG:Debug>:d>.lib" _contents "${_contents}")
-string(REPLACE "SDL2.lib" "SDL2$<$<CONFIG:Debug>:d>.lib" _contents "${_contents}")
-string(REPLACE "\${PACKAGE_PREFIX_DIR}/lib" "\${PACKAGE_PREFIX_DIR}$<$<CONFIG:Debug>:/debug>/lib" _contents "${_contents}")
-string(REPLACE "{OGRE_PREFIX_DIR}/lib" "{OGRE_PREFIX_DIR}$<$<CONFIG:Debug>:/debug>/lib" _contents "${_contents}")
-
-string(REPLACE "\"Ogre\${COMPONENT}\"" "\"Ogre\${COMPONENT}$<$<CONFIG:Debug>:_d>\"" _contents "${_contents}")
-string(REPLACE "\"Ogre\${COMPONENT}Static\"" "\"Ogre\${COMPONENT}Static$<$<CONFIG:Debug>:_d>\"" _contents "${_contents}")
-
-string(REPLACE "\"\${TYPE}_\${COMPONENT}\"" "\"\${TYPE}_\${COMPONENT}$<$<CONFIG:Debug>:_d>\"" _contents "${_contents}")
-string(REPLACE "\"\${TYPE}_\${COMPONENT}Static\"" "\"\${TYPE}_\${COMPONENT}Static$<$<CONFIG:Debug>:_d>\"" _contents "${_contents}")
-
-string(REPLACE "\"OgreMain\"" "\"\${PACKAGE_PREFIX_DIR}/lib/manual-link/OgreMain$<$<CONFIG:Debug>:_d>.lib\"" _contents "${_contents}")
-string(REPLACE "\"OgreMainStatic\"" "\"\${PACKAGE_PREFIX_DIR}/lib/manual-link/OgreMainStatic$<$<CONFIG:Debug>:_d>.lib\"" _contents "${_contents}")
-
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/ogre/OGREConfig.cmake" "${_contents}")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright)