Fix build system typos for libxsmm and ScaLAPACK

cmake/ExternalLIBXSMM.cmake

@@ -10,15 +10,17 @@ set(LIBXSMM_DEPENDENCIES)
 
 set(LIBXSMM_OPTIONS
   "PREFIX=${CMAKE_INSTALL_PREFIX}"
+  "OUTDIR=${CMAKE_INSTALL_PREFIX}/lib"
+  "DIRSTATE=."
+  "PPKGDIR=lib/pkgconfig"
+  "PMODDIR=lib/pkgconfig"
   "CC=${CMAKE_C_COMPILER}"
   "CXX=${CMAKE_CXX_COMPILER}"
   "FC="
   "FORTRAN=0"
   "BLAS=0"  # For now, no BLAS linkage (like PyFR)
   "SYM=1"   # Always build with symbols
   "VERBOSE=1"
-  "PPKGDIR=lib/pkgconfig"
-  "PMODDIR=lib/pkgconfig"
 )
 
 # Always build LIBXSMM as a shared library
@@ -56,6 +58,15 @@ ExternalProject_Add(libxsmm
   UPDATE_COMMAND    ""
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
-  INSTALL_COMMAND   ${CMAKE_MAKE_PROGRAM} ${LIBXSMM_OPTIONS} install-minimal
+  INSTALL_COMMAND
+    ${CMAKE_MAKE_PROGRAM} ${LIBXSMM_OPTIONS} install-minimal &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/.make" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmm.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmmext.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmmnoblas.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmm-shared.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmmext-shared.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmmnoblas-shared.pc" &&
+    ${CMAKE_COMMAND} -E remove -f "${CMAKE_INSTALL_PREFIX}/lib/libxsmm.env"
   TEST_COMMAND      ""
 )

cmake/ExternalScaLAPACK.cmake

@@ -61,6 +61,6 @@ if(BUILD_SHARED_LIBS)
 else()
   set(_SCALAPACK_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()
-set(SCALAPACK_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libscalapack${_SCALAPACK_LIB_SUFFIX}$<SEMICOLON>${_SCALAPACK_LIBRARIES}
+set(SCALAPACK_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libscalapack${_SCALAPACK_LIB_SUFFIX}
   CACHE STRING "List of library files for ScaLAPACK"
 )