Removing explicit check for cori or edison

and replacing it with a check for Cray KNL

CMakeLists.txt

@@ -408,8 +408,7 @@ if (RCR_FOUND)
     add_definitions(-DAPEX_HAVE_RCR)
 else()
     #if(EXISTS "/sys/cray/pm_counter/power")
-    IF(("${HOST_BASENAME}" STREQUAL "edison") OR ("$ENV{NERSC_HOST}" STREQUAL "edison") OR
-       ("${HOST_BASENAME}" STREQUAL "cori") OR ("$ENV{NERSC_HOST}" STREQUAL "cori"))
+    IF("$ENV{CRAY_CPU_TARGET}" STREQUAL "mic-knl")
         #add_definitions(-fPIC)
         set (APEX_HAVE_CRAY_POWER TRUE)
         add_definitions(-DAPEX_HAVE_CRAY_POWER)

src/apex/CMakeLists.hpx

@@ -155,12 +155,10 @@ if(EXISTS "/proc/stat" AND NOT APEX_DISABLE_PROC)
   set(proc_sources proc_read.cpp)
 endif()
 
-if("${HOST_BASENAME}" STREQUAL "edison")
-    hpx_info("apex" "This is Edison, will build with Cray Power support")
+IF("$ENV{CRAY_CPU_TARGET}" STREQUAL "mic-knl")
+    hpx_info("apex" "This is Cray KNL, will build with Cray Power support")
     set(APEX_HAVE_CRAY_POWER TRUE)
     target_compile_definitions(apex_flags INTERFACE APEX_HAVE_CRAY_POWER)
-else()
-    hpx_info("apex" "This is not edison")
 endif()
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")