From 35bd183a2059cdb04fc50aaec3dae6395f7f01c7 Mon Sep 17 00:00:00 2001 From: ccremers Date: Tue, 9 Jan 2007 15:37:43 +0000 Subject: [PATCH] - Fixed equality tests and related script problems. --- src/BuildPlatform.cmake | 8 ++++---- src/UniversalBinary.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BuildPlatform.cmake b/src/BuildPlatform.cmake index 3f6e178..f54a5eb 100644 --- a/src/BuildPlatform.cmake +++ b/src/BuildPlatform.cmake @@ -21,10 +21,10 @@ endif (Source_OS STREQUAL Destination_OS) message (STATUS "Locating platform specific file ${BuildScriptName}") # Locate the file. If it exists, start it -if (EXISTS "${BuildScriptName}") +if (EXISTS ${BuildScriptName}) # Execute the build script - include (${BuildScriptFile}) -else (EXISTS "${BuildScriptName}") + include (${BuildScriptName}) +else (EXISTS ${BuildScriptName}) # Could not find it! message (STATUS "Could not find ${BuildScriptName}") if (Source_OS STREQUAL Destination_OS) @@ -32,5 +32,5 @@ else (EXISTS "${BuildScriptName}") else (Source_OS STREQUAL Destination_OS) message (FATAL_ERROR "Don't know how to build for ${Destination_OS} on ${Source_OS}") endif (Source_OS STREQUAL Destination_OS) -endif (EXISTS "${BuildScriptName}") +endif (EXISTS ${BuildScriptName}) diff --git a/src/UniversalBinary.cmake b/src/UniversalBinary.cmake index aadf130..1dd17d2 100644 --- a/src/UniversalBinary.cmake +++ b/src/UniversalBinary.cmake @@ -9,8 +9,8 @@ find_program(lipoexecutable lipo) if (lipoexecutable) # Check whether we already have the binaries set (UBrequiredfiles FALSE) - set (ppcfile "${CMAKE_CURRENT_BINARY_DIR}/scyther-macppc") - set (intelfile "${CMAKE_CURRENT_BINARY_DIR}/scyther-macintel") + set (ppcfile "scyther-macppc") + set (intelfile "scyther-macintel") if (EXISTS "${ppcfile}") if (EXISTS "${intelfile}") set (UBrequiredfiles TRUE)