Merge pull request #132 from eth-cscs/cmake_fix

[cmake] Fix cray_libsci

Author: simonpintarelli

Diff for: cmake/FindCRAY_LIBSCI.cmake

@@ -4,7 +4,7 @@ include(FindPackageHandleStandardArgs)
 set(_sciname "sci_gnu_mpi_mp")
 set(_sciname_acc "sci_acc_gnu_nv60")
 
-find_library(CRAY_LIBSCI_LINK_LIBRARIES
+find_library(COSMA_CRAY_LIBSCI_LIBRARIES
     NAMES ${_sciname_acc} ${_sciname}
     HINTS
     ${_SCALAPACK_LIBRARY_DIRS}
@@ -13,15 +13,15 @@ find_library(CRAY_LIBSCI_LINK_LIBRARIES
     PATH_SUFFIXES lib
     DOC "Path to the Cray-libsci library.")
 
-message("CRAY_LIBSCI: ${CRAY_LIBSCI_LIBRARIES}")
+message("CRAY_LIBSCI: ${COSMA_CRAY_LIBSCI_LIBRARIES}")
 
-find_package_handle_standard_args(CRAY_LIBSCI DEFAULT_MSG CRAY_LIBSCI_LIBRARIES)
+find_package_handle_standard_args(CRAY_LIBSCI DEFAULT_MSG COSMA_CRAY_LIBSCI_LIBRARIES)
 
-if (CRAY_LIBSCI_LIBRARIES AND NOT TARGET cosma::BLAS::SCI::scalapack)
-  add_library(cosma::BLAS::SCI::sci INTERFACE IMPORTED)
-  set_target_properties(cosma::BLAS::SCI::sci PROPERTY INTERFACE_LINK_LIBRARIES "${CRAY_LIBSCI_LINK_LIBRARIES}")
-  add_library(cosma::BLAS::SCI::blas ALIAS cosma::BLAS::SCI::sci)
+if (NOT TARGET cosma::BLAS::CRAY_LIBSCI::sci)
+	add_library(cosma::BLAS::CRAY_LIBSCI::sci INTERFACE IMPORTED)
+	set_target_properties(cosma::BLAS::CRAY_LIBSCI::sci PROPERTIES INTERFACE_LINK_LIBRARIES "${COSMA_CRAY_LIBSCI_LIBRARIES}")
+	add_library(cosma::BLAS::CRAY_LIBSCI::blas ALIAS cosma::BLAS::CRAY_LIBSCI::sci)
 
-  add_library(cosma::BLAS::SCI::scalapack_link INTERFACE IMPORTED)
-  set_target_properties(cosma::BLAS::SCI::scalapack PROPERTY INTERFACE_LINK_LIBRARIES "${CRAY_LIBSCI_LINK_LIBRARIES}")
+	add_library(cosma::BLAS::CRAY_LIBSCI::scalapack_link INTERFACE IMPORTED)
+	set_target_properties(cosma::BLAS::CRAY_LIBSCI::scalapack_link PROPERTIES INTERFACE_LINK_LIBRARIES "${COSMA_CRAY_LIBSCI_LIBRARIES}")
 endif()

Diff for: cmake/FindSCALAPACK.cmake

@@ -6,7 +6,7 @@ if(COSMA_SCALAPACK STREQUAL "MKL")
     INTERFACE_LINK_LIBRARIES)
 elseif(COSMA_SCALAPACK STREQUAL "CRAY_LIBSCI")
 	find_package(CRAY_LIBSCI REQUIRED)
-	get_target_property(COSMA_SCALAPACK_LINK_LIBRARIES cosma::BLAS::SCI::scalapack_link
+	get_target_property(COSMA_SCALAPACK_LINK_LIBRARIES cosma::BLAS::CRAY_LIBSCI::scalapack_link
     INTERFACE_LINK_LIBRARIES)
 elseif(COSMA_SCALAPACK STREQUAL "CUSTOM")
   find_library(COSMA_SCALAPACK_LINK_LIBRARIES