- Fixed equality tests and related script problems.
This commit is contained in:
parent
eafb56396f
commit
35bd183a20
@ -21,10 +21,10 @@ endif (Source_OS STREQUAL Destination_OS)
|
|||||||
message (STATUS "Locating platform specific file ${BuildScriptName}")
|
message (STATUS "Locating platform specific file ${BuildScriptName}")
|
||||||
|
|
||||||
# Locate the file. If it exists, start it
|
# Locate the file. If it exists, start it
|
||||||
if (EXISTS "${BuildScriptName}")
|
if (EXISTS ${BuildScriptName})
|
||||||
# Execute the build script
|
# Execute the build script
|
||||||
include (${BuildScriptFile})
|
include (${BuildScriptName})
|
||||||
else (EXISTS "${BuildScriptName}")
|
else (EXISTS ${BuildScriptName})
|
||||||
# Could not find it!
|
# Could not find it!
|
||||||
message (STATUS "Could not find ${BuildScriptName}")
|
message (STATUS "Could not find ${BuildScriptName}")
|
||||||
if (Source_OS STREQUAL Destination_OS)
|
if (Source_OS STREQUAL Destination_OS)
|
||||||
@ -32,5 +32,5 @@ else (EXISTS "${BuildScriptName}")
|
|||||||
else (Source_OS STREQUAL Destination_OS)
|
else (Source_OS STREQUAL Destination_OS)
|
||||||
message (FATAL_ERROR "Don't know how to build for ${Destination_OS} on ${Source_OS}")
|
message (FATAL_ERROR "Don't know how to build for ${Destination_OS} on ${Source_OS}")
|
||||||
endif (Source_OS STREQUAL Destination_OS)
|
endif (Source_OS STREQUAL Destination_OS)
|
||||||
endif (EXISTS "${BuildScriptName}")
|
endif (EXISTS ${BuildScriptName})
|
||||||
|
|
||||||
|
@ -9,8 +9,8 @@ find_program(lipoexecutable lipo)
|
|||||||
if (lipoexecutable)
|
if (lipoexecutable)
|
||||||
# Check whether we already have the binaries
|
# Check whether we already have the binaries
|
||||||
set (UBrequiredfiles FALSE)
|
set (UBrequiredfiles FALSE)
|
||||||
set (ppcfile "${CMAKE_CURRENT_BINARY_DIR}/scyther-macppc")
|
set (ppcfile "scyther-macppc")
|
||||||
set (intelfile "${CMAKE_CURRENT_BINARY_DIR}/scyther-macintel")
|
set (intelfile "scyther-macintel")
|
||||||
if (EXISTS "${ppcfile}")
|
if (EXISTS "${ppcfile}")
|
||||||
if (EXISTS "${intelfile}")
|
if (EXISTS "${intelfile}")
|
||||||
set (UBrequiredfiles TRUE)
|
set (UBrequiredfiles TRUE)
|
||||||
|
Loading…
Reference in New Issue
Block a user