Merge branch 'develop'

CMakeLists.txt

@@ -11,6 +11,7 @@ endif(NOT CMAKE_BUILD_TYPE)
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(ENABLE_MPI "Enable MPI Parallelization" ON)
 enable_language(C Fortran)
 
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
@@ -19,17 +20,28 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_MACOSX_RPATH 1)
 
-find_package(OpenMP)
-if(OPENMP_FOUND)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-endif(OPENMP_FOUND)
+if(CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if("${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528")
+     set(OMP_FLAG_Intel "-openmp")
+  else()
+     set(OMP_FLAG_Intel "-qopenmp")
+  endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OMP_FLAG_Intel}")
+else()
+  find_package(OpenMP)
+  if(OPENMP_FOUND)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+  endif(OPENMP_FOUND)
+endif()
 
-find_package(MPI)
-if(MPI_FOUND)
-  include_directories(${MPI_C_INCLUDE_PATH})
-  add_definitions(-DMPI)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}")
-endif(MPI_FOUND)
+if(ENABLE_MPI)
+  find_package(MPI)
+  if(MPI_FOUND)
+    include_directories(${MPI_C_INCLUDE_PATH})
+    add_definitions(-DMPI)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_C_LINK_FLAGS}")
+  endif(MPI_FOUND)
+endif(ENABLE_MPI)
 
 find_package(LAPACK)
 if(LAPACK_FOUND)

HPhiconfig.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
+echo ""
+echo "####################  NOTICE  ########################"
+echo " HPhiconfig.sh will be removed in the future release,"
+echo " and only CMake will be supported."
+echo "######################################################"
+echo ""
 if [ -z ${1} ] || [ ${1} = "help" ]; then
     echo ""
     echo "Usage:"