Merge 10.2 into 10.3
This commit is contained in:
commit
9f8871db2f
@ -110,7 +110,11 @@ IF(NOT VERSION)
|
||||
SET(DEFAULT_MACHINE "x86")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
||||
IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
|
||||
SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
|
||||
ENDIF()
|
||||
|
||||
IF(NOT PLATFORM)
|
||||
SET(PLATFORM ${DEFAULT_PLATFORM})
|
||||
ENDIF()
|
||||
|
Loading…
x
Reference in New Issue
Block a user