Commit 9f8871db authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.2 into 10.3

parents 497b6949 ece30d47
...@@ -110,7 +110,11 @@ IF(NOT VERSION) ...@@ -110,7 +110,11 @@ IF(NOT VERSION)
SET(DEFAULT_MACHINE "x86") SET(DEFAULT_MACHINE "x86")
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
ENDIF()
IF(NOT PLATFORM) IF(NOT PLATFORM)
SET(PLATFORM ${DEFAULT_PLATFORM}) SET(PLATFORM ${DEFAULT_PLATFORM})
ENDIF() ENDIF()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment