Merge branch 'master' into gtk3
This commit is contained in:
commit
75f1312d21
@ -54,6 +54,14 @@ endif ()
|
|||||||
if (NOT(PROC_TARGET_NUMBER EQUAL 0))
|
if (NOT(PROC_TARGET_NUMBER EQUAL 0))
|
||||||
set (PROC_FLAGS ${PROC_TARGET_${PROC_TARGET_NUMBER}_FLAGS})
|
set (PROC_FLAGS ${PROC_TARGET_${PROC_TARGET_NUMBER}_FLAGS})
|
||||||
endif ()
|
endif ()
|
||||||
|
if (UNIX AND PROC_LABEL STREQUAL "undefined")
|
||||||
|
execute_process(COMMAND uname -p OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE cpu)
|
||||||
|
if ("${cpu}" STREQUAL "unknown")
|
||||||
|
set(PROC_LABEL "${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
|
else ()
|
||||||
|
set (PROC_LABEL "${cpu}")
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
# if it exists, the PROC_FORCED_LABEL value is loaded in PROC_LABEL to override the one of ProcessorTargets
|
# if it exists, the PROC_FORCED_LABEL value is loaded in PROC_LABEL to override the one of ProcessorTargets
|
||||||
if (DEFINED PROC_FORCED_LABEL)
|
if (DEFINED PROC_FORCED_LABEL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user