cleanup

cmake/Modules/FindTPLCBLAS.cmake

@@ -1,4 +1,8 @@
-IF (DEFINED CBLAS_LIBRARIES)
+IF (NOT CBLAS_ROOT)
+  SET(CBLAS_ROOT $ENV{OPENBLAS_ROOT})
+ENDIF()
+
+IF (CBLAS_LIBRARIES)
   #we were given the exact list of libraries to find
   KOKKOSKERNELS_FIND_IMPORTED(CBLAS INTERFACE
     LIBRARIES ${CBLAS_LIBRARIES}

cmake/Modules/FindTPLCHOLMOD.cmake

@@ -1,4 +1,7 @@
-IF (DEFINED CHOLMOD_LIBRARIES)
+IF (NOT CHOLMOD_ROOT)
+  SET(CHOLMOD_ROOT $ENV{SUITESPARSE_ROOT})
+ENDIF()
+IF (CHOLMOD_LIBRARIES)
   #we were given the exact list of libraries to find
   KOKKOSKERNELS_FIND_IMPORTED(CHOLMOD INTERFACE
     LIBRARIES ${CHOLMOD_LIBRARIES}

cmake/Modules/FindTPLLAPACKE.cmake

@@ -1,4 +1,7 @@
-IF (DEFINED LAPACKE_LIBRARIES)
+IF (NOT LAPACKE_ROOT)
+  SET(LAPACKE_ROOT $ENV{OPENBLAS_ROOT})
+ENDIF()
+IF (LAPACKE_LIBRARIES)
   #we were given the exact list of libraries to find
   KOKKOSKERNELS_FIND_IMPORTED(LAPACKE INTERFACE
     LIBRARIES ${LAPACKE_LIBRARIES}

cmake/Modules/FindTPLSUPERLU.cmake

@@ -1,4 +1,4 @@
-IF (DEFINED SUPERLU_LIBRARIES)
+IF (SUPERLU_LIBRARIES)
   #we were given the exact list of libraries to find
   KOKKOSKERNELS_FIND_IMPORTED(SUPERLU INTERFACE
     LIBRARIES ${SUPERLU_LIBRARIES}

cmake/kokkoskernels_tpls.cmake

@@ -149,23 +149,24 @@ MACRO(kokkoskernels_find_library VAR_NAME TPL_NAME)
    "PATHS;LIBRARY_NAMES"
    ${ARGN})
 
-  SET(${LIB}_FOUND FALSE)
+  SET(${TPL_NAME}_LIB_FOUND FALSE)
   SET(HAVE_CUSTOM_PATHS FALSE)
-  IF(NOT ${LIB}_FOUND AND DEFINED ${TPL_NAME}_ROOT)
+  IF(NOT ${TPL_NAME}_LIB_FOUND AND DEFINED ${TPL_NAME}_ROOT)
     FIND_LIBRARY(${VAR_NAME}
       NAMES ${TPL_LIBRARY_NAMES}
       PATHS ${${TPL_NAME}_ROOT}/lib ${${TPL_NAME}_ROOT}/lib64 NO_DEFAULT_PATH)
     SET(HAVE_CUSTOM_PATHS TRUE)
   ENDIF()
 
-  IF(NOT ${LIB}_FOUND AND KOKKOSKERNELS_${TPL_NAME}_ROOT)
+  IF(NOT ${TPL_NAME}_LIB_FOUND AND KOKKOSKERNELS_${TPL_NAME}_ROOT)
     #we got root paths, only look in these paths and nowhere else
-    FIND_LIBRARY(${VAR_NAME} ${LIB} 
+    FIND_LIBRARY(${VAR_NAME}
+      NAMES ${TPL_LIBRARY_NAMES}
       PATHS ${KOKKOSKERNELS_${TPL_NAME}_ROOT}/lib ${KOKKOSKERNELS_${TPL_NAME}_ROOT}/lib64 NO_DEFAULT_PATH)
     SET(HAVE_CUSTOM_PATHS TRUE)
   ENDIF()
 
-  IF (NOT ${LIB}_FOUND AND TPL_PATHS)
+  IF (NOT ${TPL_NAME}_LIB_FOUND AND TPL_PATHS)
     #we got custom paths, only look in these paths and nowhere else
     FIND_LIBRARY(${VAR_NAME}
       NAMES ${TPL_LIBRARY_NAMES}
@@ -175,7 +176,7 @@ MACRO(kokkoskernels_find_library VAR_NAME TPL_NAME)
 
 
   IF (NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
-    IF (NOT ${LIB}_FOUND)
+    IF (NOT ${TPL_NAME}_LIB_FOUND)
       #Now go ahead and look in system paths
       FIND_LIBRARY(${VAR_NAME} NAMES ${TPL_LIBRARY_NAMES})
     ENDIF()
@@ -254,6 +255,9 @@ MACRO(kokkoskernels_find_imported NAME)
   IF(TPL_HEADER)
     LIST(APPEND TPL_VARS_NEEDED ${NAME}_INCLUDE_DIRS)
   ENDIF()
+  IF(TPL_HEADERS)
+    LIST(APPEND TPL_VARS_NEEDED ${NAME}_INCLUDE_DIRS)
+  ENDIF()
   IF(TPL_LIBRARIES)
     LIST(APPEND TPL_VARS_NEEDED ${NAME}_FOUND_LIBRARIES)
   ENDIF()
@@ -338,6 +342,7 @@ ENDMACRO()
 MACRO(kokkoskernels_import_tpl NAME)
   SET(${NAME}_LIBRARIES "" CACHE STRING "Optional override for the libraries that comprise TPL ${NAME}. Default: None. Default common library names will be searched")
   SET(${NAME}_LIBRARY_DIRS "" CACHE STRING "Optional override for the library directories that comprise TPL ${NAME}. Default: None. Default common library locations will be searched")
+  SET(${NAME}_INCLUDE_DIRS "" CACHE STRING "Optional override for the header directories that comprise TPL ${NAME}. Default: None. Default common header locations will be searched")
 
   CMAKE_PARSE_ARGUMENTS(TPL
    "NO_EXPORT"
@@ -460,6 +465,9 @@ IF (KOKKOSKERNELS_ENABLE_TPL_MAGMA)
   LIST(APPEND TPL_LIST "MAGMA")
 ENDIF()
 
+KOKKOSKERNELS_ADD_TPL_OPTION(CHOLMOD OFF  "Whether to enable CHOLMOD")
+KOKKOSKERNELS_ADD_TPL_OPTION(SUPERLU OFF  "Whether to enable SUPERLU")
+
 # We need to do all the import work
 IF (NOT KOKKOSKERNELS_HAS_TRILINOS)
   KOKKOSKERNELS_IMPORT_TPL(BLAS)