From 262295615925c082ec3f98c3fc1f6c259d09ee6f Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 13 Jan 2006 11:44:39 -0500
Subject: ENH: fix for CMakeTmp move broken stuff

---
 Source/cmTryCompileCommand.cxx                      | 2 +-
 Utilities/cmcurl/CMake/CheckTypeSize.cmake          | 2 +-
 Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx
index 7d0014c..ce0b61a 100644
--- a/Source/cmTryCompileCommand.cxx
+++ b/Source/cmTryCompileCommand.cxx
@@ -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] + "/CMakeFiles/CMakeTmp") == source.npos)
+    if(source.find("CMakeTmp") == source.npos)
       {
       mf->AddCMakeDependFile(source.c_str());
       }
diff --git a/Utilities/cmcurl/CMake/CheckTypeSize.cmake b/Utilities/cmcurl/CMake/CheckTypeSize.cmake
index dd023a6..26c822d 100644
--- a/Utilities/cmcurl/CMake/CheckTypeSize.cmake
+++ b/Utilities/cmcurl/CMake/CheckTypeSize.cmake
@@ -23,7 +23,7 @@ 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}/CMakeFiles/CMakeTmp/CheckTypeSize.c" @ONLY)
+      "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)
     FILE(READ "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"
       CHECK_TYPE_SIZE_FILE_CONTENT)
     MESSAGE(STATUS "Check size of ${TYPE}")
diff --git a/Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake b/Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake
index 44dc8e4..606520c 100644
--- a/Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake
+++ b/Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake
@@ -15,9 +15,10 @@ MACRO(TRY_COMPILE_FROM_SOURCE SOURCE VAR)
     ENDFOREACH(inc)
 
     SET(src "${src}\nint main() { ${SOURCE} ; return 0; }")
-    FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/src.c"
+    FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/src2.c"
       "${src}")
-
+    EXEC_PROGRAM("${CMAKE_COMMAND}" "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp"
+      ARGS -E copy src2.c src.c)
     MESSAGE(STATUS "Performing Test ${VAR}")
     TRY_COMPILE(${VAR}
       ${CMAKE_BINARY_DIR}
-- 
cgit v0.12