From 5952e586ceaa7ea68376f1580c6c96edca55804b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 5 Feb 2019 23:51:40 +0100 Subject: [PATCH] Support DYNAMIC_LIST option in cmake e.g. cmake -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST="NEHALEM;HASWELL;ZEN" .. original issue was #1639 --- cmake/arch.cmake | 3 +++ cmake/system.cmake | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index 63fb86f..470ea2a 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -74,6 +74,9 @@ if (DYNAMIC_ARCH) if (NOT NO_AVX512) set(DYNAMIC_CORE ${DYNAMIC_CORE} SKYLAKEX) endif () + if (DYNAMIC_LIST) + set(DYNAMIC_CORE PRESCOTT ${DYNAMIC_LIST}) + endif () endif () if (NOT DYNAMIC_CORE) diff --git a/cmake/system.cmake b/cmake/system.cmake index 4cee7bd..7fda2ad 100644 --- a/cmake/system.cmake +++ b/cmake/system.cmake @@ -187,6 +187,13 @@ if (DYNAMIC_ARCH) endif () endif () +if (DYNAMIC_LIST) + set(CCOMMON_OPT "${CCOMMON_OPT} -DDYNAMIC_LIST") + foreach(DCORE ${DYNAMIC_LIST}) + set(CCOMMON_OPT "${CCOMMON_OPT} -DDYN_${DCORE}") + endforeach () +endif () + if (NO_LAPACK) set(CCOMMON_OPT "${CCOMMON_OPT} -DNO_LAPACK") #Disable LAPACK C interface -- 2.7.4