From 2c4d9730f143bc4a8e1f09fc0b56ceb2e56dcd95 Mon Sep 17 00:00:00 2001
From: David Brady <dbrady@telltalegames.com>
Date: Mon, 4 Feb 2013 12:27:12 -0800
Subject: [PATCH] Quick hack to allow fixing up of try_compile targets

---
 Source/cmCoreTryCompile.cxx |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 1ae7035..53bc605 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -291,13 +291,21 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     sprintf(targetNameBuf, "cmTryCompileExec%u",
             cmSystemTools::RandomSeed());
     targetName = targetNameBuf;
+    
+    fprintf(fout, "SET(CMAKE_TRY_COMPILE_TARGET %s)\n", targetName);
 
     /* Put the executable at a known location (for COPY_FILE).  */
     fprintf(fout, "SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n",
             this->BinaryDirectory.c_str());
     /* Create the actual executable.  */
-    fprintf(fout, "ADD_EXECUTABLE(%s \"%s\")\n", targetName, source.c_str());
-    fprintf(fout, "TARGET_LINK_LIBRARIES(%s ${LINK_LIBRARIES})\n",targetName);
+    fprintf(fout, "ADD_EXECUTABLE(${CMAKE_TRY_COMPILE_TARGET} \"%s\")\n", source.c_str());
+    fprintf(fout, "TARGET_LINK_LIBRARIES(${CMAKE_TRY_COMPILE_TARGET} ${LINK_LIBRARIES})\n");
+
+    if(this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_FIXUP")!=0)
+      {
+      fprintf(fout, this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_FIXUP"));
+      }
+
     fclose(fout);
     projectName = "CMAKE_TRY_COMPILE";
     // if the source is not in CMakeTmp
-- 
1.7.9.msysgit.0

From d243324053a354b080165f198405d9d3505b7b7f Mon Sep 17 00:00:00 2001
From: David Brady <dbrady@telltalegames.com>
Date: Wed, 6 Feb 2013 17:53:22 -0800
Subject: [PATCH] Fix try_compile and try_run on IOS

---
 Source/cmCoreTryCompile.cxx |    9 ++++++---
 Source/cmTryRunCommand.cxx  |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 53bc605..b0c1425 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -303,7 +303,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
 
     if(this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_FIXUP")!=0)
       {
-      fprintf(fout, this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_FIXUP"));
+      fprintf(fout, "%s\n", this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_FIXUP"));
       }
 
     fclose(fout);
@@ -372,8 +372,11 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
           {
           emsg << this->FindErrorMessage.c_str();
           }
-        this->Makefile->IssueMessage(cmake::FATAL_ERROR, emsg.str());
-        return -1;
+        if (!this->Makefile->IsOn("CMAKE_CROSSCOMPILING"))
+          {
+          this->Makefile->IssueMessage(cmake::FATAL_ERROR, emsg.str());
+          return -1;
+          }
         }
       }
     }
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 4fc0b13..3061827 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -139,7 +139,7 @@ bool cmTryRunCommand
   // now try running the command if it compiled
   if (!res)
     {
-    if (this->OutputFile.size() == 0)
+    if (this->OutputFile.size() == 0 && !this->Makefile->IsOn("CMAKE_CROSSCOMPILING"))
       {
       cmSystemTools::Error(this->FindErrorMessage.c_str());
       }
-- 
1.7.9.msysgit.0