diff --git a/ports/ogre-next/fix_find_package_sdl2.patch b/ports/ogre-next/fix_find_package_sdl2.patch index aa72be664b..47aa01afbd 100644 --- a/ports/ogre-next/fix_find_package_sdl2.patch +++ b/ports/ogre-next/fix_find_package_sdl2.patch @@ -1,18 +1,77 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 4b67ed8cb..7da194820 100644 +index 3f3e2d7..0cc9606 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -292,11 +292,11 @@ macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from +@@ -267,7 +267,7 @@ endif() + ####################################################################### + # Find sdl2 - if(NOT ANDROID AND NOT EMSCRIPTEN) - # find script does not work in cross compilation environment -- find_package(SDL2) -+ find_package(SDL2 CONFIG) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") - if(SDL2_FOUND AND WIN32 AND NOT SDL2_BINARY) - # fix linking static SDL2 on windows -- set(SDL2_LIBRARY ${SDL2_LIBRARY} winmm.lib imm32.lib version.lib) -+ set(SDL2_LIBRARY SDL2::SDL2 winmm.lib imm32.lib version.lib) - endif() +-find_package(SDL2) ++find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") + + ####################################################################### +diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake +index f98b358..e5eb9ed 100644 +--- a/CMake/InstallDependencies.cmake ++++ b/CMake/InstallDependencies.cmake +@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES) + endif () + + if( OGRE_BUILD_SAMPLES2 ) +- install_debug(SDL2.dll) +- install_release(SDL2.dll) + install_debug(openvr_api.dll) + install_release(openvr_api.dll) + install_debug(openvr_api.pdb) +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake +index 4b42a51..793eb71 100644 +--- a/CMake/Packages/FindSDL2.cmake ++++ b/CMake/Packages/FindSDL2.cmake +@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP) + INCLUDE(FindPackageHandleStandardArgs) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 +- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) ++ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR) + + if (WIN32) + set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll +@@ -201,6 +201,6 @@ IF(SDL2_STATIC) + if (UNIX AND NOT APPLE) + EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS) + STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}") +- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS}) ++ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS}) + ENDIF() + ENDIF(SDL2_STATIC) +diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt +index b21601e..4ef90bd 100644 +--- a/Samples/2.0/Common/CMakeLists.txt ++++ b/Samples/2.0/Common/CMakeLists.txt +@@ -49,4 +49,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::SDL2 OgreHlmsPbs OgreHlmsUnlit) +diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +index 5e80709..3ba9b5a 100644 +--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake ++++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +@@ -224,13 +224,13 @@ endif() + + if( NOT IOS ) + set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" ) +- find_package( SDL2 ) ++ find_package(SDL2 CONFIG REQUIRED) + if( NOT SDL2_FOUND ) + message( "Could not find SDL2. https://www.libsdl.org/" ) + else() + message( STATUS "Found SDL2" ) + include_directories( ${SDL2_INCLUDE_DIR} ) +- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} ) ++ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 ) + endif() endif() diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 02f147ab85..5766b5d9c6 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -1,5 +1,4 @@ # This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. - if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") endif() @@ -11,12 +10,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF 8083067c1835147de5d82015347d95c710e36bc0 - SHA512 2660f739def7076b42009ba932a27532f2a20e7be8ec2674aff29116c7dcd7f2d75564d8ce07bef3dba13ece5293d604573ad4f8734f6086c1750127f52834cd + REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 + SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 HEAD_REF master PATCHES toolchain_fixes.patch - rename_config_cmake.patch fix_find_package_sdl2.patch ) @@ -28,18 +26,21 @@ else() set(OGRE_STATIC OFF) endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + FEATURES + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_COPY_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF -DOGRE_BUILD_TOOLS=OFF @@ -50,7 +51,6 @@ vcpkg_configure_cmake( -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 @@ -59,55 +59,52 @@ vcpkg_configure_cmake( -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre-next ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +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) + +file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg") if(REL_CFGS) - file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE ${REL_CFGS}) endif() -file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) +file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg") if(DBG_CFGS) - file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + 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) + 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) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + 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) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/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) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/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) + 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) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/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) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") endif() endif() - file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake) + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) file(READ "${SHARE_FILE}" _contents) string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") @@ -116,6 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ogre-next/rename_config_cmake.patch b/ports/ogre-next/rename_config_cmake.patch deleted file mode 100644 index d85603290c..0000000000 --- a/ports/ogre-next/rename_config_cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 79f7514..79bc033 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -215,7 +215,7 @@ if(NOT DEFINED OGRE_CMAKE_DIR) - set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") - endif() - endif() --configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} - PATH_VARS CMAKE_INSTALL_PREFIX) - write_basic_package_version_file( -@@ -223,7 +223,7 @@ write_basic_package_version_file( - VERSION ${OGRE_VERSION} - COMPATIBILITY SameMajorVersion) - install(FILES -- ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+ ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake - DESTINATION ${OGRE_CMAKE_DIR} - ) diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index 9ff2d87dfe..ff5eb48506 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -1,5 +1,5 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index a7a3796..2e21403 100644 +index f3a62f2..b53df6f 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -13,10 +13,12 @@ @@ -18,41 +18,7 @@ index a7a3796..2e21403 100644 + endif() endif() - set(INST_FILES Utils/FindPkgMacros.cmake) -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 783755e..79f7514 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -208,10 +208,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() - configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} -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) + set(INST_FILES diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake index 7c89ec5..d8314f0 100644 --- a/CMake/Packages/FindFreeImage.cmake @@ -93,7 +59,7 @@ index 7125895..13a306f 100644 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 2b9deba..f33a298 100644 +index 95c70cd..893ce01 100644 --- a/CMake/Packages/FindNVAPI.cmake +++ b/CMake/Packages/FindNVAPI.cmake @@ -44,7 +44,7 @@ findpkg_framework(NVAPI) @@ -155,7 +121,7 @@ index 6b6d7fa..3667b8b 100644 findpkg_finish(POCO_XML) diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake -index 0c48510..c121966 100644 +index 4200aa0..35e4ea3 100644 --- a/CMake/Packages/FindTBB.cmake +++ b/CMake/Packages/FindTBB.cmake @@ -104,7 +104,7 @@ findpkg_framework(TBB) @@ -184,7 +150,7 @@ index 0c48510..c121966 100644 +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 +index c112071..214d9e5 100644 --- a/CMake/Packages/FindZZip.cmake +++ b/CMake/Packages/FindZZip.cmake @@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) @@ -203,7 +169,7 @@ index e97951e..54c2567 100644 findpkg_finish(ZZip) diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake -index 374f84b..dc7066d 100644 +index 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake +++ b/CMake/Utils/FindPkgMacros.cmake @@ -79,15 +79,21 @@ endmacro (use_pkgconfig) @@ -238,54 +204,28 @@ index 374f84b..dc7066d 100644 # Generate debug names from given release names diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e09d2d..58968f0 100644 +index 48af55b..b18ac57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -274,7 +274,7 @@ elseif(EMSCRIPTEN) - elseif (APPLE AND NOT APPLE_IOS) +@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) - set(XCODE_ATTRIBUTE_SDKROOT macosx) + # Set build variables + set(XCODE_ATTRIBUTE_SDKROOT iphoneos) - 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/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index bdb303d..d9cc221 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -21,7 +21,7 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - # setup target - 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 PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB) -+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) - target_include_directories(OgreOverlay PUBLIC - "$" - $ diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 6ec4e34..cc9cb9d 100644 +index 0424ebb..b019269 100644 --- a/OgreMain/CMakeLists.txt +++ b/OgreMain/CMakeLists.txt -@@ -225,8 +225,6 @@ if (APPLE) +@@ -434,8 +434,6 @@ if (APPLE) set_target_properties(OgreMain PROPERTIES LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" ) - - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") - if(OGRE_BUILD_LIBS_AS_FRAMEWORKS) - add_custom_command(TARGET OgreMain POST_BUILD -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 - "$" - $) --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) + add_custom_command(TARGET OgreMain POST_BUILD + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index a729f0bfd8..7a6a81bd94 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ogre-next", - "version-string": "2019-10-20", - "port-version": 2, + "version": "2.3.0", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", + "license": "MIT", "dependencies": [ "boost-date-time", "boost-thread", @@ -15,6 +15,14 @@ "sdl2", "tbb", "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib", "zziplib" ], diff --git a/versions/baseline.json b/versions/baseline.json index ace992755c..6900ebf996 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4973,8 +4973,8 @@ "port-version": 7 }, "ogre-next": { - "baseline": "2019-10-20", - "port-version": 2 + "baseline": "2.3.0", + "port-version": 0 }, "ois": { "baseline": "1.5.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 88181a1f30..40f6f7475f 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b1cca4f491d535e198fc79195bf357811b4122a", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", "version-string": "2019-10-20",