ENH: put CmakeTmp into CMakeFiles

4 files changed, 7 insertions, 7 deletions

diff --git a/Source/CTest/Curl/CMake/CheckTypeSize.cmake b/Source/CTest/Curl/CMake/CheckTypeSize.cmake
index ddc990a..dd023a6 100644
--- a/Source/CTest/Curl/CMake/CheckTypeSize.cmake
+++ b/Source/CTest/Curl/CMake/CheckTypeSize.cmake
@@ -23,8 +23,8 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
       SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
     ENDFOREACH(def)
     CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in"
-      "${CMAKE_BINARY_DIR}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)
-    FILE(READ "${CMAKE_BINARY_DIR}/CMakeTmp/CheckTypeSize.c"
+      "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c" @ONLY)
+    FILE(READ "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"
       CHECK_TYPE_SIZE_FILE_CONTENT)
     MESSAGE(STATUS "Check size of ${TYPE}")
     IF(CMAKE_REQUIRED_LIBRARIES)
@@ -33,7 +33,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
     ENDIF(CMAKE_REQUIRED_LIBRARIES)
     TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
       ${CMAKE_BINARY_DIR}
-      "${CMAKE_BINARY_DIR}/CMakeTmp/CheckTypeSize.c"
+      "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"
       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
       "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
       OUTPUT_VARIABLE OUTPUT)
diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx
index 3991f21..7d0014c 100644
--- a/Source/cmTryCompileCommand.cxx
+++ b/Source/cmTryCompileCommand.cxx
@@ -110,7 +110,7 @@ int cmTryCompileCommand::CoreTryCompileCode(
   // signature
   if (srcFileSignature)
     {
-    tmpString = argv[1] + "/CMakeTmp";
+    tmpString = argv[1] + "/CMakeFiles/CMakeTmp";
     binaryDirectory = tmpString.c_str();
     }
   // make sure the binary directory exists
@@ -201,7 +201,7 @@ int cmTryCompileCommand::CoreTryCompileCode(
     projectName = "CMAKE_TRY_COMPILE";
     targetName = "cmTryCompileExec";
     // if the source is not in CMakeTmp 
-    if(source.find(argv[1] + "/CMakeTmp") == source.npos)
+    if(source.find(argv[1] + "/CMakeFiles/CMakeTmp") == source.npos)
       {
       mf->AddCMakeDependFile(source.c_str());
       }
diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h
index 6a5c48c..55774fb 100644
--- a/Source/cmTryCompileCommand.h
+++ b/Source/cmTryCompileCommand.h
@@ -89,7 +89,7 @@ public:
       "extra flags that can be included are,  "
       "INCLUDE_DIRECTORIES, LINK_DIRECTORIES, and LINK_LIBRARIES.  "
       "COMPILE_DEFINITIONS are -Ddefinition that will be passed to the "
-      "compile line. If srcfile is specified the files in bindir/CMakeTmp "
+      "compile line. If srcfile is specified the files in bindir/CMakeFiles/CMakeTmp "
       "are cleaned automatically. If OUTPUT_VARIABLE is specified, then the "
       "output from the build process is stored in the given variable. "
       "TRY_COMPILE creates a CMakeList.txt "
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index b4f1456..a2179d8 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -67,7 +67,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
   int res = cmTryCompileCommand::CoreTryCompileCode(m_Makefile, tryCompile, false);
   
   // now try running the command if it compiled
-  std::string binaryDirectory = argv[2] + "/CMakeTmp";
+  std::string binaryDirectory = argv[2] + "/CMakeFiles/CMakeTmp";
   if (!res)
     {
     int retVal = -1;