diff --git a/spgemm/mkl_shmem/CMakeLists.txt b/spgemm/mkl_shmem/CMakeLists.txt
index 8cb09f9635b5715926331d0785ccea5671224086..f2a8b272ab601d47aed78dccd1aaab6be08fd70f 100644
--- a/spgemm/mkl_shmem/CMakeLists.txt
+++ b/spgemm/mkl_shmem/CMakeLists.txt
@@ -8,8 +8,11 @@
 #
 # ==================================================================================================
 cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../cmake/Modules")
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
+find_package(MKL)
+
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../cmake/common.cmake)
 
@@ -25,13 +28,33 @@ set(NAME ${DWARF_PREFIX}_spgemm_mkl_shmem)
 
 find_package(Common)
 
-SET(ICC_MKL_LINK_FLAGS    "-mkl")
-SET( CMAKE_EXE_LINKER_FLAGS  "${ICC_MKL_LINK_FLAGS}" )
+select_compiler_flags(cxx_flags
+  GNU "-march=native"   # I suggest remove "-O3" as this is controlled by the CMAKE_BUILD_TYPE
+  CLANG "-march=native" # same here
+  Intel "-axavx2,avx")
+set(CXX_FLAGS ${cxx_flags})
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CXX_FLAGS "${CXX_FLAGS} -Wall -Wno-comment")
+  if(APPLE)
+    set(CXX_FLAGS "${CXX_FLAGS} -Wa,-q")
+  endif()
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS}")
 
-add_executable(${NAME} mklspgemm.c mmio.c)
-install(TARGETS ${NAME} DESTINATION bin)
 # ==================================================================================================
 
+# LUD with the MKL library
+if (MKL_FOUND)
+	include_directories(${MKL_INCLUDE_DIR})
+	link_directories(${MKL_LIBRARY_DIR})
+	add_executable(${NAME} mklspgemm.c mmio.c)
+	target_link_libraries(${NAME} mkl_intel_lp64 mkl_sequential mkl_core pthread m)
+	install(TARGETS ${NAME} DESTINATION bin)
+else ()
+	message("## Skipping '${NAME}': no MKL support found")
+  install(CODE "MESSAGE(\"${NAME} can only be built with MKL.\")")
+endif()
+
 unset(NAME)
 
 # ==================================================================================================