diff options
Diffstat (limited to 'internal/rosa/cmake.go')
| -rw-r--r-- | internal/rosa/cmake.go | 110 |
1 files changed, 2 insertions, 108 deletions
diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index c169b046..bb488abd 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -4,116 +4,10 @@ import ( "path/filepath" "slices" "strings" - - "hakurei.app/internal/pkg" ) -func (t Toolchain) newCMake() (pkg.Artifact, string) { - const ( - version = "4.3.2" - checksum = "6QylwRVKletndTSkZTV2YBRwgd_9rUVgav_QW23HpjUgV21AVYZOUOal8tdBDmO7" - ) - return t.NewPackage("cmake", version, newFromGitHubRelease( - "Kitware/CMake", - "v"+version, - "cmake-"+version+".tar.gz", - checksum, - pkg.TarGzip, - ), &PackageAttr{ - // test suite expects writable source tree - Writable: true, - - // expected to be writable in the copy made during bootstrap - Chmod: true, - - Patches: []KV{ - {"bootstrap-test-no-openssl", `diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake -index 137de78bc1..b4da52e664 100644 ---- a/Tests/BootstrapTest.cmake -+++ b/Tests/BootstrapTest.cmake -@@ -9,7 +9,7 @@ if(NOT nproc EQUAL 0) - endif() - message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}") - execute_process( -- COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} -+ COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} -- -DCMAKE_USE_OPENSSL=OFF - WORKING_DIRECTORY "${bin_dir}" - RESULT_VARIABLE result - ) -`}, - - {"disable-broken-tests-musl", `diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 2ead810437..f85cbb8b1c 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -384,7 +384,6 @@ if(BUILD_TESTING) - add_subdirectory(CMakeLib) - endif() - add_subdirectory(CMakeOnly) -- add_subdirectory(RunCMake) - - add_subdirectory(FindPackageModeMakefileTest) - -@@ -528,9 +527,6 @@ if(BUILD_TESTING) - -DCMake_TEST_CUDA:BOOL=${CMake_TEST_CUDA} - -DCMake_INSTALL_NAME_TOOL_BUG:BOOL=${CMake_INSTALL_NAME_TOOL_BUG} - ) -- ADD_TEST_MACRO(ExportImport ExportImport) -- set_property(TEST ExportImport APPEND -- PROPERTY LABELS "CUDA") - ADD_TEST_MACRO(Unset Unset) - ADD_TEST_MACRO(PolicyScope PolicyScope) - ADD_TEST_MACRO(EmptyLibrary EmptyLibrary) -@@ -624,7 +620,6 @@ if(BUILD_TESTING) - # run test for BundleUtilities on supported platforms/compilers - if((MSVC OR - MINGW OR -- CMAKE_SYSTEM_NAME MATCHES "Linux" OR - CMAKE_SYSTEM_NAME MATCHES "Darwin") - AND NOT CMAKE_GENERATOR STREQUAL "Watcom WMake") - -@@ -3095,10 +3090,6 @@ if(BUILD_TESTING) - "${CMake_SOURCE_DIR}/Tests/CTestTestFdSetSize/test.cmake.in" - "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/test.cmake" - @ONLY ESCAPE_QUOTES) -- add_test(CTestTestFdSetSize ${CMAKE_CTEST_COMMAND} -- -S "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/test.cmake" -j20 -V --timeout 120 -- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/testOutput.log" -- ) - - if(CMAKE_TESTS_CDASH_SERVER) - set(regex "^([^:]+)://([^/]+)(.*)$") -`}, - }, - }, &MakeHelper{ - OmitDefaults: true, - - ConfigureName: "/usr/src/cmake/bootstrap", - Configure: []KV{ - {"prefix", "/system"}, - {"parallel", jobsE}, - {"--"}, - {"-DCMAKE_USE_OPENSSL", "OFF"}, - {"-DCMake_TEST_NO_NETWORK", "ON"}, - }, - Check: []string{ - "CTEST_OUTPUT_ON_FAILURE=1", - "CTEST_PARALLEL_LEVEL=128", - "test", - }, - }, - KernelHeaders, - ), version -} -func init() { - native.mustRegister(Toolchain.newCMake, &Metadata{ - Name: "cmake", - Description: "cross-platform, open-source build system", - Website: "https://cmake.org/", - - ID: 306, - }) -} +// CMake is the package used by [CMakeHelper]. +var CMake = H("cmake") // CMakeHelper is the [CMake] build system helper. type CMakeHelper struct { |