eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] enable clang-cl and WoA builds #348

Merged
crueter merged 31 commits from liz-clang-cl-cmake into master 2025-09-09 20:47:51 +02:00
Conversation 9 Commits 31 Files changed 276 +7 -10
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4a67c0ce3f - Show all commits

2
CMakeModules/CPM.cmake
View file

@ -593,7 +593,7 @@ function(cpm_add_patches)
endif() endif()
# Add the patch command to the list # Add the patch command to the list
# use binary because DOS SUCKS # use binary because DOS SUCKS
list(APPEND temp_list "${PATCH_EXECUTABLE}" "--binary" "-p1" "<" "${PATCH_FILE}") list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}")
endforeach() endforeach()
# Move temp out into parent scope. # Move temp out into parent scope.

2
CMakeModules/CPMUtil.cmake
View file

@ -146,7 +146,7 @@ function(AddJsonPackage)
get_json_element("${object}" url url "") get_json_element("${object}" url url "")
get_json_element("${object}" key key "") get_json_element("${object}" key key "")
get_json_element("${object}" tag tag "") get_json_element("${object}" tag tag "")
get_json_element("${object}" raw_artifact artifact "") get_json_element("${object}" artifact artifact "")
get_json_element("${object}" git_version git_version "") get_json_element("${object}" git_version git_version "")
get_json_element("${object}" git_host git_host "") get_json_element("${object}" git_host git_host "")
get_json_element("${object}" source_subdir source_subdir "") get_json_element("${object}" source_subdir source_subdir "")

2
cpmfile.json
View file

@ -12,7 +12,7 @@
"repo": "boostorg/boost", "repo": "boostorg/boost",
"tag": "boost-%VERSION%", "tag": "boost-%VERSION%",
"artifact": "%TAG%-cmake.tar.xz", "artifact": "%TAG%-cmake.tar.xz",
"hash": "56e654724842d891a2755a9d9d7442c5b239c5aeb806e526ae889a7f51748c08e8aabe76b27415e550bdf2e3051bdf87ab39df32aba0edd1c52e1d11cffcb897", "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
"git_version": "1.89.0", "git_version": "1.89.0",
"version": "1.57", "version": "1.57",
"patches": [ "patches": [

11
externals/cpmfile.json vendored
View file

@ -1,12 +1,9 @@
{ {
"mbedtls": { "mbedtls": {
"repo": "Mbed-TLS/mbedtls", "repo": "eden-emulator/mbedtls",
"sha": "8c88150ca1", "sha": "ce4f81f4a9",
"hash": "769ad1e94c570671071e1f2a5c0f1027e0bf6bcdd1a80ea8ac970f2c86bc45ce4e31aa88d6d8110fc1bed1de81c48bc624df1b38a26f8b340a44e109d784a966", "hash": "f2e7f887651b28745e508149214d409fd7cfdb92cb94b4146b47ff1e0fc09e47143f203ac18e34c2c1814b5bd031d04c74828676c0d4342920a2ddb7fd35e9a5",
"find_args": "MODULE", "find_args": "MODULE"
"patches": [
"0001-cmake-version.patch"
]
}, },
"spirv-headers": { "spirv-headers": {
"package": "SPIRV-Headers", "package": "SPIRV-Headers",