96 lines
5.6 KiB
Diff
96 lines
5.6 KiB
Diff
--- a/external/glm/CMakeLists.txt 2021-07-09 13:22:53.677786671 +0300
|
|
+++ b/external/glm/CMakeLists.txt 2021-07-14 16:14:28.168992834 +0300
|
|
@@ -4,12 +4,12 @@
|
|
include(../Common.cmake)
|
|
|
|
# User Option: The glm version to use.
|
|
- set(glm_DOWNLOAD_VERSION "0.9.9.4" CACHE INTERNAL "The version of GLM to download and use")
|
|
+ set(glm_DOWNLOAD_VERSION "0.9.9.5" CACHE INTERNAL "The version of GLM to download and use")
|
|
# User Option: The URL from where to download glm.
|
|
- set(glm_URL "https://github.com/g-truc/glm/archive/${glm_DOWNLOAD_VERSION}.tar.gz" CACHE INTERNAL "URL from which to download GLM")
|
|
+ set(glm_URL ${CMAKE_CURRENT_LIST_DIR}/downloads/glm_downloads/glm-0.9.9.5.tar.gz)
|
|
|
|
# User option: The hash used for glm
|
|
- set(glm_ARCHIVE_HASH "e60bcfb57c53b03e55cb4fc2f2cc58e6" CACHE INTERNAL "The validation MD5 hash to use for the downloaded MD5 archive/")
|
|
+ set(glm_ARCHIVE_HASH "7d23305a095ab7421bfc8fc71d493a13" CACHE INTERNAL "The validation MD5 hash to use for the downloaded MD5 archive/")
|
|
|
|
if(ANDROID)
|
|
# Set the glm source directory
|
|
@@ -44,4 +44,4 @@
|
|
|
|
# Add this target to the list of targets for easier use
|
|
# set_property(GLOBAL APPEND PROPERTY PVR_EXTERNAL_TARGETS glm) --DISABLED: GLM is an INTERFACE target
|
|
-endif()
|
|
\ No newline at end of file
|
|
+endif()
|
|
--- a/external/pugixml/CMakeLists.txt 2021-07-09 13:22:53.677786671 +0300
|
|
+++ b/external/pugixml/CMakeLists.txt 2021-07-09 15:24:59.936241296 +0300
|
|
@@ -6,7 +6,7 @@
|
|
# User Option: Set current pugixml version. If set, will affect the PugiXML URL
|
|
set(pugixml_DOWNLOAD_VERSION "1.10" CACHE INTERNAL "The version of PugiXML to use")
|
|
# User Option: Set the URL from where to download PugiXML. Notice, that just changing the version should affect this.
|
|
- set(pugixml_URL "https://github.com/zeux/pugixml/releases/download/v${pugixml_DOWNLOAD_VERSION}/pugixml-${pugixml_DOWNLOAD_VERSION}.tar.gz" CACHE INTERNAL "PugiXML package Download URL")
|
|
+ set(pugixml_URL ${CMAKE_CURRENT_LIST_DIR}/downloads/pugixml_downloads/pugixml-1.10.tar.gz)
|
|
# User option: The hash used for VMA
|
|
set(pugixml_ARCHIVE_HASH "f97237e9908201c6d8536210747b66af" CACHE INTERNAL "The validation MD5 hash for the downloaded PugiXML archive.")
|
|
|
|
@@ -49,4 +49,4 @@
|
|
configure_file("${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build/pugixmlConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/build/pugixmlConfig.cmake" COPYONLY)
|
|
|
|
set_property(GLOBAL APPEND PROPERTY PVR_EXTERNAL_TARGETS pugixml)
|
|
-endif()
|
|
\ No newline at end of file
|
|
+endif()
|
|
--- a/external/VulkanMemoryAllocator/CMakeLists.txt 2021-07-09 13:22:53.801789128 +0300
|
|
+++ b/external/VulkanMemoryAllocator/CMakeLists.txt 2021-07-09 15:20:24.526723392 +0300
|
|
@@ -6,7 +6,7 @@
|
|
# User Option: Set current VulkanMemoryAllocator version.
|
|
set(VulkanMemoryAllocator_DOWNLOAD_VERSION "v2.3.0" CACHE INTERNAL "The version of Vulkan Memory Allocator to use")
|
|
# User Option: The URL from which to download the VulkanMemoryAllocator.
|
|
- set(VulkanMemoryAllocator_URL "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VulkanMemoryAllocator_DOWNLOAD_VERSION}.tar.gz" CACHE INTERNAL "The URL from wich VulkanMemoryAllocator will be downloaded")
|
|
+ set(VulkanMemoryAllocator_URL ${CMAKE_CURRENT_LIST_DIR}/downloads/VulkanMemoryAllocator_downloads/VulkanMemoryAllocator-v2.3.0.tar.gz CACHE INTERNAL "The URL from wich VulkanMemoryAllocator will be downloaded")
|
|
# User option: The hash used for VMA
|
|
set(VulkanMemoryAllocator_ARCHIVE_HASH "1846f2b0f04c485356cd7ce31a02a2be" CACHE INTERNAL "The validation MD5 hash to use for the downloaded VulkanMemoryAllocator archive")
|
|
|
|
@@ -24,7 +24,7 @@
|
|
endif()
|
|
|
|
|
|
- download_external_project("VulkanMemoryAllocator"
|
|
+ download_external_project("VulkanMemoryAllocator"
|
|
CMAKE_FILES_DIR "${CMAKE_CURRENT_BINARY_DIR}/download"
|
|
SRC_DIR "${VulkanMemoryAllocator_SRC_DIR}"
|
|
DOWNLOAD_DIR "${VulkanMemoryAllocator_DOWNLOAD_DIR}"
|
|
@@ -50,4 +50,4 @@
|
|
file(COPY VulkanMemoryAllocatorConfig.cmake.in DESTINATION "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/" NO_SOURCE_PERMISSIONS)
|
|
configure_file("${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/VulkanMemoryAllocatorConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/VulkanMemoryAllocatorConfig.cmake" COPYONLY)
|
|
endif()
|
|
-endif()
|
|
\ No newline at end of file
|
|
+endif()
|
|
--- a/external/glslang/CMakeLists.txt 2021-07-09 10:22:53.677786671 +0000
|
|
+++ b/external/glslang/CMakeLists.txt 2021-07-19 10:21:21.269038423 +0000
|
|
@@ -5,7 +5,7 @@
|
|
set(glslang_DOWNLOAD_VERSION "11.2.0" CACHE INTERNAL "The exact version of GLSLANG to download from github")
|
|
|
|
# User Option: The URL from where to download glslang.
|
|
- set(glslang_URL "https://github.com/KhronosGroup/glslang/archive/${glslang_DOWNLOAD_VERSION}.tar.gz" CACHE INTERNAL "The URL from which to downlad glslang.")
|
|
+ set(glslang_URL ${CMAKE_CURRENT_LIST_DIR}/downloads/glslang_downloads/glslang-11.2.0.tar.gz)
|
|
|
|
# User option: The hash used for glslang
|
|
set(glslang_ARCHIVE_HASH "13d32fb1824fad7dda970e48f2c1c6c9" CACHE INTERNAL "The validation MD5 hash to use for the downloaded MD5 archive")
|
|
@@ -28,5 +28,5 @@
|
|
set(PVR_GLSLANG_VALIDATOR_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../glslangValidator/bin/osx" CACHE INTERNAL "")
|
|
elseif(CMAKE_HOST_UNIX)
|
|
set(HOST_EXECUTABLE_SUFFIX "" CACHE INTERNAL "")
|
|
- set(PVR_GLSLANG_VALIDATOR_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../glslangValidator/bin/linux" CACHE INTERNAL "")
|
|
+ set(PVR_GLSLANG_VALIDATOR_INSTALL_DIR "/usr/bin/" CACHE INTERNAL "")
|
|
endif()
|
|
@@ -104,4 +106,4 @@
|
|
add_executable(glslangValidator IMPORTED GLOBAL)
|
|
|
|
set_target_properties(glslangValidator PROPERTIES IMPORTED_LOCATION "${glslangValidator_BINARY_LOCATION}")
|
|
-endif()
|
|
\ No newline at end of file
|
|
+endif()
|