Merge 10.2 into 10.3
This commit is contained in:
commit
9f8871db2f
@ -111,6 +111,10 @@ IF(NOT VERSION)
|
|||||||
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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user