From 7ca6bdf0355157da9f85f6bbf039a632ffdf66b7 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 16 Dec 2014 13:59:22 -0500
Subject: [PATCH] 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.
---
 Tests/CMakeLib/CMakeLists.txt                                 | 2 ++
 .../PseudoMemcheck}/CMakeLists.txt                            | 2 +-
 .../PseudoMemcheck/NoLog}/CMakeLists.txt                      | 0
 .../PseudoMemcheck}/memtester.cxx.in                          | 0
 Tests/CMakeLists.txt                                          | 4 ----
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename Tests/{CTestTestMemcheck => CMakeLib/PseudoMemcheck}/CMakeLists.txt (97%)
 rename Tests/{CTestTestMemcheck/NoLogDummyChecker => CMakeLib/PseudoMemcheck/NoLog}/CMakeLists.txt (100%)
 rename Tests/{CTestTestMemcheck => CMakeLib/PseudoMemcheck}/memtester.cxx.in (100%)

diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index 8c99f6418..7ef3c037a 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -48,3 +48,5 @@ if(TEST_CompileCommandOutput)
   add_executable(runcompilecommands run_compile_commands.cxx)
   target_link_libraries(runcompilecommands CMakeLib)
 endif()
+
+add_subdirectory(PseudoMemcheck)
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt
similarity index 97%
rename from Tests/CTestTestMemcheck/CMakeLists.txt
rename to Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt
index 5d6319a2e..c53befcb8 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(memcheck_fail CMakeLib)
 # 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
 # same filenames.
-add_subdirectory(NoLogDummyChecker)
+add_subdirectory(NoLog)
 
 # Xcode 2.x forgets to create the output directory before linking
 # the individual architectures.
diff --git a/Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt b/Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt
similarity index 100%
rename from Tests/CTestTestMemcheck/NoLogDummyChecker/CMakeLists.txt
rename to Tests/CMakeLib/PseudoMemcheck/NoLog/CMakeLists.txt
diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
similarity index 100%
rename from Tests/CTestTestMemcheck/memtester.cxx.in
rename to Tests/CMakeLib/PseudoMemcheck/memtester.cxx.in
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 33c18ce2a..250e96619 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -110,10 +110,6 @@ if(BUILD_TESTING)
 
   add_subdirectory(FindPackageModeMakefileTest)
 
-  if(NOT CMake_TEST_EXTERNAL_CMAKE)
-    add_subdirectory(CTestTestMemcheck)
-  endif()
-
   # Collect a list of all test build directories.
   set(TEST_BUILD_DIRS)