echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove stale references to CMakeServerLib

Browse Source
This commit is contained in:
Kyle Edwards 2022-08-02 11:05:52 -04:00
parent ad20e7b2ae
commit bf7e3124cb
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/os-linux.yml
View File

@ -481,7 +481,7 @@
# use the scripts here. # use the scripts here.
- "$LAUNCHER make -j$(nproc)" - "$LAUNCHER make -j$(nproc)"
# NOTE: This regex matches that used in the release build. # 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. # Make a package.
- bin/cpack -G TGZ - bin/cpack -G TGZ
- bin/cpack -G STGZ - bin/cpack -G STGZ

3
CMakeLists.txt
View File

@ -883,9 +883,6 @@ add_subdirectory(Tests)
if(NOT CMake_TEST_EXTERNAL_CMAKE) if(NOT CMake_TEST_EXTERNAL_CMAKE)
if(BUILD_TESTING) if(BUILD_TESTING)
CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests") CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
IF(TARGET CMakeServerLibTests)
CMAKE_SET_TARGET_FOLDER(CMakeServerLibTests "Tests")
ENDIF()
endif() endif()
if(TARGET documentation) if(TARGET documentation)
CMAKE_SET_TARGET_FOLDER(documentation "Documentation") CMAKE_SET_TARGET_FOLDER(documentation "Documentation")

2
Utilities/Release/linux/aarch64/Dockerfile
View File

@ -25,7 +25,7 @@ RUN : \
&& nice make -j $(nproc) \ && nice make -j $(nproc) \
&& if $TEST; then \ && if $TEST; then \
# Run tests that require the full build tree. # 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 \ fi \
&& bin/cpack -G TGZ \ && bin/cpack -G TGZ \
&& bin/cpack -G STGZ \ && bin/cpack -G STGZ \

2
Utilities/Release/linux/x86_64/Dockerfile
View File

@ -26,7 +26,7 @@ RUN : \
&& nice make -j $(nproc) \ && nice make -j $(nproc) \
&& if $TEST; then \ && if $TEST; then \
# Run tests that require the full build tree. # 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 \ fi \
&& bin/cpack -G TGZ \ && bin/cpack -G TGZ \
&& bin/cpack -G STGZ \ && bin/cpack -G STGZ \