diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-03 13:45:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-03 13:45:55 (GMT) |
| commit | 3afb7b25fb361bf08d607bed4570d0e7f9cdbf7f (patch) | |
| tree | b4e282183111ce64022feabdbaec75a89bcef844 | |
| parent | e2112b37786eee4f4f47bc2dd548e51349076254 (diff) | |
| parent | bf7e3124cbed46fe4e34b90684697983963946ce (diff) | |
| download | CMake-3afb7b25fb361bf08d607bed4570d0e7f9cdbf7f.zip CMake-3afb7b25fb361bf08d607bed4570d0e7f9cdbf7f.tar.gz CMake-3afb7b25fb361bf08d607bed4570d0e7f9cdbf7f.tar.bz2 | |
Merge topic 'remove-cmakeserverlib-references'
bf7e3124cb Remove stale references to CMakeServerLib
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7537
| -rw-r--r-- | .gitlab/os-linux.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Utilities/Release/linux/aarch64/Dockerfile | 2 | ||||
| -rw-r--r-- | Utilities/Release/linux/x86_64/Dockerfile | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 25d5365..37e5c22 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -481,7 +481,7 @@ # use the scripts here. - "$LAUNCHER make -j$(nproc)" # NOTE: This regex matches that used in the release build. - - "$LAUNCHER bin/ctest --output-on-failure -j$(nproc) -R '^(CMake\\.|CMakeLib\\.|CMakeServerLib\\.|RunCMake\\.ctest_memcheck)'" + - "$LAUNCHER bin/ctest --output-on-failure -j$(nproc) -R '^(CMake\\.|CMakeLib\\.|RunCMake\\.ctest_memcheck)'" # Make a package. - bin/cpack -G TGZ - bin/cpack -G STGZ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d9d3ca..267518b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -883,9 +883,6 @@ add_subdirectory(Tests) if(NOT CMake_TEST_EXTERNAL_CMAKE) if(BUILD_TESTING) CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests") - IF(TARGET CMakeServerLibTests) - CMAKE_SET_TARGET_FOLDER(CMakeServerLibTests "Tests") - ENDIF() endif() if(TARGET documentation) CMAKE_SET_TARGET_FOLDER(documentation "Documentation") diff --git a/Utilities/Release/linux/aarch64/Dockerfile b/Utilities/Release/linux/aarch64/Dockerfile index 9abae2a..e232c01 100644 --- a/Utilities/Release/linux/aarch64/Dockerfile +++ b/Utilities/Release/linux/aarch64/Dockerfile @@ -25,7 +25,7 @@ RUN : \ && nice make -j $(nproc) \ && if $TEST; then \ # Run tests that require the full build tree. - bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|CMakeServerLib\.|RunCMake\.ctest_memcheck)'; \ + bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|RunCMake\.ctest_memcheck)'; \ fi \ && bin/cpack -G TGZ \ && bin/cpack -G STGZ \ diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 8c98d3e..736ee26 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -26,7 +26,7 @@ RUN : \ && nice make -j $(nproc) \ && if $TEST; then \ # Run tests that require the full build tree. - bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|CMakeServerLib\.|RunCMake\.ctest_memcheck)'; \ + bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|RunCMake\.ctest_memcheck)'; \ fi \ && bin/cpack -G TGZ \ && bin/cpack -G STGZ \ |