aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_apply_patches.cmake1
-rw-r--r--scripts/cmake/vcpkg_build_cmake.cmake3
-rw-r--r--scripts/cmake/vcpkg_build_qmake.cmake1
-rw-r--r--scripts/cmake/vcpkg_configure_cmake.cmake6
-rw-r--r--scripts/cmake/vcpkg_download_distfile.cmake10
-rw-r--r--scripts/cmake/vcpkg_extract_source_archive.cmake1
-rw-r--r--scripts/cmake/vcpkg_from_github.cmake3
-rw-r--r--scripts/cmake/vcpkg_install_meson.cmake2
-rw-r--r--scripts/ports.cmake19
-rw-r--r--scripts/vcpkgTools.xml30
10 files changed, 33 insertions, 43 deletions
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake
index 1894d6e9a..d62fbbf84 100644
--- a/scripts/cmake/vcpkg_apply_patches.cmake
+++ b/scripts/cmake/vcpkg_apply_patches.cmake
@@ -51,7 +51,6 @@ function(vcpkg_apply_patches)
message(STATUS "Applying patch failed. This is expected if this patch was previously applied.")
endif()
- message(STATUS "Applying patch ${PATCH} done")
math(EXPR PATCHNUM "${PATCHNUM}+1")
endforeach()
endfunction()
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 983ac9221..9aafb0d4b 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -74,7 +74,7 @@ function(vcpkg_build_cmake)
set(CONFIG "Release")
endif()
- message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
+ message(STATUS "Building ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
set(LOGS)
@@ -174,7 +174,6 @@ function(vcpkg_build_cmake)
${STRINGIFIED_LOGS})
endif()
endif()
- message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} done")
if(_bc_ADD_BIN_TO_PATH)
set(ENV{PATH} "${_BACKUP_ENV_PATH}")
endif()
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake
index 194ab8206..5d894a646 100644
--- a/scripts/cmake/vcpkg_build_qmake.cmake
+++ b/scripts/cmake/vcpkg_build_qmake.cmake
@@ -33,7 +33,6 @@ function(vcpkg_build_qmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX}
LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX}
)
- message(STATUS "Package ${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} done")
endfunction()
# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 3e0922428..81a30d4bb 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -122,6 +122,9 @@ function(vcpkg_configure_cmake)
if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
+ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
+ set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
+ endif()
endif()
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
@@ -239,7 +242,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure
LOGNAME config-${TARGET_TRIPLET}
)
- message(STATUS "Configuring ${TARGET_TRIPLET} done")
else()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
@@ -249,7 +251,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME config-${TARGET_TRIPLET}-dbg
)
- message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@@ -260,7 +261,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME config-${TARGET_TRIPLET}-rel
)
- message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
endif()
endif()
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index 9fc0a0c9a..db3e45594 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -81,9 +81,8 @@ function(vcpkg_download_distfile VAR)
return()
endif()
- message(STATUS "Testing integrity of ${FILE_KIND}...")
file(SHA512 ${FILE_PATH} FILE_HASH)
- if(NOT "${FILE_HASH}" STREQUAL "${vcpkg_download_distfile_SHA512}")
+ if(NOT FILE_HASH STREQUAL vcpkg_download_distfile_SHA512)
message(FATAL_ERROR
"\nFile does not have expected hash:\n"
" File path: [ ${FILE_PATH} ]\n"
@@ -91,10 +90,9 @@ function(vcpkg_download_distfile VAR)
" Actual hash: [ ${FILE_HASH} ]\n"
"${CUSTOM_ERROR_ADVICE}\n")
endif()
- message(STATUS "Testing integrity of ${FILE_KIND}... OK")
endfunction()
- if(EXISTS ${downloaded_file_path})
+ if(EXISTS "${downloaded_file_path}")
message(STATUS "Using cached ${downloaded_file_path}")
test_hash("${downloaded_file_path}" "cached file" "Please delete the file and retry if this file should be downloaded again.")
else()
@@ -104,7 +102,7 @@ function(vcpkg_download_distfile VAR)
# Tries to download the file.
list(GET vcpkg_download_distfile_URLS 0 SAMPLE_URL)
- if(${_VCPKG_DOWNLOAD_TOOL} MATCHES "ARIA2" AND NOT ${SAMPLE_URL} MATCHES "aria2")
+ if(_VCPKG_DOWNLOAD_TOOL STREQUAL "ARIA2" AND NOT SAMPLE_URL MATCHES "aria2")
vcpkg_find_acquire_program("ARIA2")
message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}...")
execute_process(
@@ -127,7 +125,6 @@ function(vcpkg_download_distfile VAR)
)
set(download_success 0)
else()
- message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}... OK")
file(REMOVE
${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log
${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log
@@ -144,7 +141,6 @@ function(vcpkg_download_distfile VAR)
message(STATUS "Downloading ${url}... Failed. Status: ${download_status}")
set(download_success 0)
else()
- message(STATUS "Downloading ${url}... OK")
set(download_success 1)
break()
endif()
diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake
index 5c16616c6..3aafd4ca4 100644
--- a/scripts/cmake/vcpkg_extract_source_archive.cmake
+++ b/scripts/cmake/vcpkg_extract_source_archive.cmake
@@ -53,7 +53,6 @@ function(vcpkg_extract_source_archive_ex)
)
file(WRITE ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted)
endif()
- message(STATUS "Extracting done")
endfunction()
function(vcpkg_extract_source_archive ARCHIVE)
diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake
index 28ada0631..fbceb2aae 100644
--- a/scripts/cmake/vcpkg_from_github.cmake
+++ b/scripts/cmake/vcpkg_from_github.cmake
@@ -141,7 +141,7 @@ function(vcpkg_from_github)
endif()
set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
-
+ message(STATUS "Using source at ${SOURCE_PATH}")
return()
endif()
@@ -205,4 +205,5 @@ function(vcpkg_from_github)
PATCHES ${_vdud_PATCHES}
)
set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE)
+ message(STATUS "Using source at ${TEMP_SOURCE_PATH}")
endfunction()
diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake
index f6d49288c..7ab9d55b3 100644
--- a/scripts/cmake/vcpkg_install_meson.cmake
+++ b/scripts/cmake/vcpkg_install_meson.cmake
@@ -10,7 +10,6 @@ function(vcpkg_install_meson)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME package-${TARGET_TRIPLET}-rel
)
- message(STATUS "Package ${TARGET_TRIPLET}-rel done")
message(STATUS "Package ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process(
@@ -18,6 +17,5 @@ function(vcpkg_install_meson)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME package-${TARGET_TRIPLET}-dbg
)
- message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
endfunction()
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index ef06a4d65..7a5f2749f 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -37,7 +37,7 @@ if(CMD MATCHES "^BUILD$")
message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}")
endif()
- if(NOT DEFINED CURRENT_PORT_DIR)
+ if(NOT DEFINED CURRENT_PORT_DIR)
message(FATAL_ERROR "CURRENT_PORT_DIR was not defined")
endif()
set(TO_CMAKE_PATH "${CURRENT_PORT_DIR}" CURRENT_PORT_DIR)
@@ -51,19 +51,18 @@ if(CMD MATCHES "^BUILD$")
message(FATAL_ERROR "Port is missing control file: ${CURRENT_PORT_DIR}/CONTROL")
endif()
- message(STATUS "CURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}")
- message(STATUS "DOWNLOADS=${DOWNLOADS}")
-
- message(STATUS "CURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}")
- message(STATUS "CURRENT_BUILDTREES_DIR=${CURRENT_BUILDTREES_DIR}")
- message(STATUS "CURRENT_PORT_DIR=${CURRENT_PORT_DIR}")
-
unset(PACKAGES_DIR)
unset(BUILDTREES_DIR)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})
if(EXISTS ${CURRENT_PACKAGES_DIR})
- message(FATAL_ERROR "Unable to remove directory: ${CURRENT_PACKAGES_DIR}\n Files are likely in use.")
+ file(GLOB FILES_IN_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}/*")
+ if(FILES_IN_CURRENT_PACKAGES_DIR)
+ file(REMOVE_RECURSE ${FILES_IN_CURRENT_PACKAGES_DIR})
+ file(GLOB FILES_IN_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}/*")
+ if(FILES_IN_CURRENT_PACKAGES_DIR)
+ message(FATAL_ERROR "Unable to empty directory: ${CURRENT_PACKAGES_DIR}\n Files are likely in use.")
+ endif()
+ endif()
endif()
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 314f62701..320e86275 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,25 +1,25 @@
<?xml version="1.0"?>
<tools version="2">
<tool name="cmake" os="windows">
- <version>3.10.2</version>
- <exeRelativePath>cmake-3.10.2-win32-x86\bin\cmake.exe</exeRelativePath>
- <url>https://cmake.org/files/v3.10/cmake-3.10.2-win32-x86.zip</url>
- <sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
- <archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
+ <version>3.11.4</version>
+ <exeRelativePath>cmake-3.11.4-win32-x86\bin\cmake.exe</exeRelativePath>
+ <url>https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip</url>
+ <sha512>3d866ef3c41a9cf738427fccf4730ccf8fd86bb4d13e9a1671b156bbdb2bc6beeecc7e7e8190cea8297498cfd67366c71231e9e08b121d4cd6e5ceac04124c19</sha512>
+ <archiveName>cmake-3.11.4-win32-x86.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
- <version>3.10.2</version>
- <exeRelativePath>cmake-3.10.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
- <url>https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz</url>
- <sha512>cb7d76e11c892eb786da5804282c4141564390c3552e08c506c7abb93015eb5f619c55255459872b219399ce8114ac321fe92df7f82a7e42bbc874eec240571e</sha512>
- <archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
+ <version>3.11.4</version>
+ <exeRelativePath>cmake-3.11.4-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
+ <url>https://cmake.org/files/v3.11/cmake-3.11.4-Darwin-x86_64.tar.gz</url>
+ <sha512>eeb967dc5b6e46e8dee06939b8b416d40f644baad79ffd90f86ad18e1e3b58b50dec0f064e60467125be9bedb7de8c48fbcb8a97ca731645939539f97645db54</sha512>
+ <archiveName>cmake-3.11.4-Darwin-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
- <version>3.10.2</version>
- <exeRelativePath>cmake-3.10.2-Linux-x86_64/bin/cmake</exeRelativePath>
- <url>https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz</url>
- <sha512>54389b5cb3f3cb9d182d35e0b1eaf7b301695899930da0d26e9df1dc25056213a077646d23ea609a93daa81d30687757d9cf0dc263339fa3d73dbeb1284bc1a9</sha512>
- <archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
+ <version>3.11.4</version>
+ <exeRelativePath>cmake-3.11.4-Linux-x86_64/bin/cmake</exeRelativePath>
+ <url>https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz</url>
+ <sha512>70d92eea972710684582154dc1b884536aba5abda130a431257750b54437c46397aea39c2cc31056ecf36ddadbc1cf5c22434794fb314ea67c15a9be3bd20092</sha512>
+ <archiveName>cmake-3.11.4-Linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="git" os="windows">
<version>2.17.1</version>
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-11 20:17:03 +0000