kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Move CTestTestMemcheck tools into Tests/CMakeLib 

The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests
require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck
directory.
This commit is contained in:
Brad King 2014-12-16 13:59:22 -05:00
parent 1651dc9668
commit 7ca6bdf035
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLib/CMakeLists.txt
View File

@ -48,3 +48,5 @@ if(TEST_CompileCommandOutput)
add_executable(runcompilecommands run_compile_commands.cxx) add_executable(runcompilecommands run_compile_commands.cxx)
target_link_libraries(runcompilecommands CMakeLib) target_link_libraries(runcompilecommands CMakeLib)
endif() endif()
add_subdirectory(PseudoMemcheck)

2
Tests/CTestTestMemcheck/CMakeLists.txt → Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt
View File

@ -23,7 +23,7 @@ target_link_libraries(memcheck_fail CMakeLib)
# Binaries that are used as memchecker that do not write the expected # Binaries that are used as memchecker that do not write the expected
# output file. Need to be in their own subdirectory as they have the # output file. Need to be in their own subdirectory as they have the
# same filenames. # same filenames.
add_subdirectory(NoLogDummyChecker) add_subdirectory(NoLog)
# Xcode 2.x forgets to create the output directory before linking # Xcode 2.x forgets to create the output directory before linking
# the individual architectures. # the individual architectures.

0
Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt → Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt
View File

0
Tests/CTestTestMemcheck/memtester.cxx.in → Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
View File

4
Tests/CMakeLists.txt
View File

@ -110,10 +110,6 @@ if(BUILD_TESTING)
add_subdirectory(FindPackageModeMakefileTest) add_subdirectory(FindPackageModeMakefileTest)
if(NOT CMake_TEST_EXTERNAL_CMAKE)
add_subdirectory(CTestTestMemcheck)
endif()
# Collect a list of all test build directories. # Collect a list of all test build directories.
set(TEST_BUILD_DIRS) set(TEST_BUILD_DIRS)