mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-28 08:22:56 +02:00
cmake: update to 4.0.2.
This commit is contained in:
parent
5529940646
commit
c1ddcdfe78
4 changed files with 13 additions and 10 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
|
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
|
||||||
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
|
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
|
||||||
@@ -15,9 +15,9 @@ set(_check
|
@@ -16,9 +16,9 @@ set(_check
|
||||||
[[librunpath_parent_unresolved\.so]]
|
[[librunpath_parent_unresolved\.so]]
|
||||||
[[librunpath_unresolved\.so]]
|
[[librunpath_unresolved\.so]]
|
||||||
)
|
)
|
||||||
|
@ -11,11 +11,11 @@
|
||||||
+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
|
+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
|
||||||
+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
|
+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
|
||||||
set(_check
|
set(_check
|
||||||
"^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
|
"^$"
|
||||||
)
|
)
|
||||||
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
|
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
|
||||||
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
|
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
|
||||||
@@ -65,7 +65,6 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "
|
@@ -66,7 +66,6 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "
|
||||||
|
|
||||||
if(NOT CMake_COMPILER_FORCES_NEW_DTAGS)
|
if(NOT CMake_COMPILER_FORCES_NEW_DTAGS)
|
||||||
run_install_test(linux)
|
run_install_test(linux)
|
||||||
|
|
|
@ -1,18 +1,21 @@
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -527,9 +527,6 @@ if(BUILD_TESTING)
|
@@ -533,12 +533,6 @@ if(BUILD_TESTING)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||||
- # Install license file as it requires.
|
- # Install license file as it requires.
|
||||||
- install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR})
|
- install(FILES
|
||||||
|
- "${CMake_LICENSE_FILE}"
|
||||||
|
- "${CMake_SOURCE_DIR}/CONTRIBUTORS.rst"
|
||||||
|
- DESTINATION ${CMAKE_DOC_DIR})
|
||||||
-
|
-
|
||||||
# Install script directories.
|
# Install script directories.
|
||||||
install(
|
install(
|
||||||
DIRECTORY Help Modules Templates
|
DIRECTORY Help Modules Templates
|
||||||
--- a/Source/kwsys/CMakeLists.txt
|
--- a/Source/kwsys/CMakeLists.txt
|
||||||
+++ b/Source/kwsys/CMakeLists.txt
|
+++ b/Source/kwsys/CMakeLists.txt
|
||||||
@@ -607,11 +607,6 @@ if(KWSYS_INSTALL_DOC_DIR)
|
@@ -602,11 +602,6 @@ if(KWSYS_INSTALL_DOC_DIR)
|
||||||
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
|
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/Modules/GetPrerequisites.cmake
|
--- a/Modules/GetPrerequisites.cmake
|
||||||
+++ b/Modules/GetPrerequisites.cmake
|
+++ b/Modules/GetPrerequisites.cmake
|
||||||
@@ -730,7 +730,7 @@ function(get_prerequisites target prereq
|
@@ -728,7 +728,7 @@ function(get_prerequisites target prereq
|
||||||
|
|
||||||
if(gp_tool MATCHES "ldd$")
|
if(gp_tool MATCHES "ldd$")
|
||||||
set(gp_cmd_args "")
|
set(gp_cmd_args "")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'cmake'
|
# Template file for 'cmake'
|
||||||
pkgname=cmake
|
pkgname=cmake
|
||||||
version=3.30.1
|
version=4.0.2
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
|
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
|
||||||
|
@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
|
||||||
license="BSD-3-Clause, ICU"
|
license="BSD-3-Clause, ICU"
|
||||||
homepage="https://www.cmake.org"
|
homepage="https://www.cmake.org"
|
||||||
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
|
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1
|
checksum=1c3a82c8ca7cf12e0b17178f9d0c32f7ac773bd5651a98fcfd80fbf4977f8d48
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||||
configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"
|
configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"
|
||||||
|
@ -37,7 +37,7 @@ post_install() {
|
||||||
vlicense fld.license
|
vlicense fld.license
|
||||||
sed -e '/\$FreeBSD\$/q' Utilities/cmelf/elf_common.h >elf.license
|
sed -e '/\$FreeBSD\$/q' Utilities/cmelf/elf_common.h >elf.license
|
||||||
vlicense elf.license
|
vlicense elf.license
|
||||||
vlicense Copyright.txt
|
vlicense LICENSE.rst
|
||||||
}
|
}
|
||||||
|
|
||||||
cmake-gui_package() {
|
cmake-gui_package() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue