diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
| commit | f740d23ce6574bf57449aa48b22d6345f35ad2c0 (patch) | |
| tree | 85eb18f1464b3dc76e571354401a2072cb8c8ba0 /cmake/cpu_info.cmake | |
| parent | e21c15a7e626b5c01d9770d82aaed56053c7baef (diff) | |
| parent | 97e0c260dc8273f809915505f8dfdccd948b4b99 (diff) | |
| download | mariadb-git-f740d23ce6574bf57449aa48b22d6345f35ad2c0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'cmake/cpu_info.cmake')
| -rw-r--r-- | cmake/cpu_info.cmake | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/cmake/cpu_info.cmake b/cmake/cpu_info.cmake index 7c2c08a07db..c53759d24d6 100644 --- a/cmake/cpu_info.cmake +++ b/cmake/cpu_info.cmake @@ -15,12 +15,25 @@ # Symbols with information about the CPU. -FIND_PROGRAM(GETCONF getconf) -MARK_AS_ADVANCED(GETCONF) +IF(CMAKE_SYSTEM_NAME MATCHES "Darwin") + FIND_PROGRAM(SYSCTL sysctl) + MARK_AS_ADVANCED(SYSCTL) -IF(GETCONF) - EXECUTE_PROCESS( - COMMAND ${GETCONF} LEVEL1_DCACHE_LINESIZE - OUTPUT_VARIABLE CPU_LEVEL1_DCACHE_LINESIZE - ) + IF(SYSCTL) + EXECUTE_PROCESS( + COMMAND ${SYSCTL} -n hw.cachelinesize + OUTPUT_VARIABLE CPU_LEVEL1_DCACHE_LINESIZE + ) + ENDIF() + +ELSE() + FIND_PROGRAM(GETCONF getconf) + MARK_AS_ADVANCED(GETCONF) + + IF(GETCONF) + EXECUTE_PROCESS( + COMMAND ${GETCONF} LEVEL1_DCACHE_LINESIZE + OUTPUT_VARIABLE CPU_LEVEL1_DCACHE_LINESIZE + ) + ENDIF() ENDIF() |