Commit 9365ac05 authored by Radu Popescu's avatar Radu Popescu Committed by Antonio Cervone
Browse files

Bugfixes and less warnings

Changed the type of some cached CMake variables.

Removed from CMakeLists.txt (unused) checks for some standard C
headers. Also removed the corresponding defines from lifeconfig.h
parent a8235011
......@@ -11,24 +11,26 @@ set (CMAKE_CXX_COMPILER "mpicxx" CACHE STRING "Default C++ compiler")
set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Default build type")
# Default value for TPL flags
set (LIFE_USE_HDF5 FALSE CACHE STRING "By default, don't use HDF5")
set (LIFE_USE_QHULL FALSE CACHE STRING "By default, don't use QHULL")
set (LIFE_USE_SuperLU FALSE CACHE STRING "By default, don't use SuperLU")
set (LIFE_USE_SuperLUMT FALSE CACHE STRING "By default, don't use SuperLUMT")
set (LIFE_USE_SuperLUDist FALSE CACHE STRING "By default, don't use SuperLUDist")
set (LIFE_USE_UMFPACK FALSE CACHE STRING "By default, don't use UMFPACK")
set (LIFE_USE_MPI_WRAPPER TRUE CACHE STRING "By default, use the MPI wrappers")
set (LIFE_USE_SPIRIT_PARSER TRUE CACHE STRING "By default, use the Boost Spirit parser")
set (LIFE_USE_HDF5 FALSE CACHE BOOL "By default, don't use HDF5")
set (LIFE_USE_QHULL FALSE CACHE BOOL "By default, don't use QHULL")
set (LIFE_USE_SuperLU FALSE CACHE BOOL "By default, don't use SuperLU")
set (LIFE_USE_SuperLUMT FALSE CACHE BOOL "By default, don't use SuperLUMT")
set (LIFE_USE_SuperLUDist FALSE CACHE BOOL "By default, don't use SuperLUDist")
set (LIFE_USE_UMFPACK FALSE CACHE BOOL "By default, don't use UMFPACK")
set (LIFE_USE_MPI_WRAPPER TRUE CACHE BOOL "By default, use the MPI wrappers")
set (LIFE_USE_SPIRIT_PARSER TRUE CACHE BOOL "By default, use the Boost Spirit parser")
# Put some other variables in the cache so they can be set with ccmake
set (PARMETIS_ROOT "PARMETIS_ROOT-NOTFOUND" CACHE STRING "Location of ParMETIS")
set (UMFPACK_ROOT "UMFPACK_ROOT-NOTFOUND" CACHE STRING "Location of UMFPACK")
set (HDF5_ROOT "HDF5_ROOT-NOTFOUND" CACHE STRING "Location of HDF5")
set (QHULL_ROOT "QHULL_ROOT-NOTFOUND" CACHE STRING "Location of QHULL")
set (SuperLU_ROOT "SuperLU_ROOT-NOTFOUND" CACHE STRING "Location of SuperLU")
set (SuperLUMT_ROOT "SuperLUMT_ROOT-NOTFOUND" CACHE STRING "Location of SuperLUMT")
set (SuperLUDist_ROOT "SuperLUDist_ROOT-NOTFOUND" CACHE STRING "Location of SuperLUDist")
set (BOOST_ROOT "BOOST_ROOT-NOTFOUND" CACHE STRING "Location of Boost")
set (PARMETIS_ROOT "PARMETIS_ROOT-NOTFOUND" CACHE PATH "Location of ParMETIS")
set (UMFPACK_ROOT "UMFPACK_ROOT-NOTFOUND" CACHE PATH "Location of UMFPACK")
set (HDF5_ROOT "HDF5_ROOT-NOTFOUND" CACHE PATH "Location of HDF5")
set (QHULL_ROOT "QHULL_ROOT-NOTFOUND" CACHE PATH "Location of QHULL")
set (SuperLU_ROOT "SuperLU_ROOT-NOTFOUND" CACHE PATH "Location of SuperLU")
set (SuperLUMT_ROOT "SuperLUMT_ROOT-NOTFOUND" CACHE PATH "Location of SuperLUMT")
set (SuperLUDist_ROOT "SuperLUDist_ROOT-NOTFOUND" CACHE PATH "Location of SuperLUDist")
set (BOOST_ROOT "BOOST_ROOT-NOTFOUND" CACHE PATH "Location of Boost")
set (BLAS_LIBRARIES "BLAS_LIBRARIES-NOTFOUND" CACHE PATH "BLAS libraries")
set (LAPACK_LIBRARIES "LAPACK_LIBRARIES-NOTFOUND" CACHE PATH "LAPACK libraries")
# Project options
project (LifeV)
......@@ -245,17 +247,6 @@ set (LIBS ${LIBS} ${LIFE_EXTRA_LINK_LINE})
string (COMPARE EQUAL ${CMAKE_BUILD_TYPE} "Debug" HAVE_LIFEV_DEBUG)
string (COMPARE EQUAL ${CMAKE_BUILD_TYPE} "Release" HAVE_LIFEV_OPTO3)
check_include_files(dlfcn.h HAVE_DLFCN_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdlib.h HAVE_STDLIB_H)
check_include_files(memory.h HAVE_MEMORY_H)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
check_include_files(sys/types.h HAVE_SYS_TYPES_H)
check_include_files(unistd.h HAVE_UNISTD_H)
configure_file(
"${PROJECT_SOURCE_DIR}/lifeconfig_cmake.h.in"
"${PROJECT_BINARY_DIR}/lifeconfig.h"
......
......@@ -75,39 +75,9 @@
/* define lifev optO3 */
#cmakedefine HAVE_LIFEV_OPTO3
/* Define to 1 if you have the <dlfcn.h> header file. */
#cmakedefine HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */
#cmakedefine HAVE_INTTYPES_H
/* Define if the QHULL library is used. */
#cmakedefine HAVE_QHULL
/* Define to 1 if you have the <stdint.h> header file. */
#cmakedefine HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#cmakedefine HAVE_STDLIB_H
/* Define to 1 if you have the <memory.h> header file. */
#cmakedefine HAVE_MEMORY_H
/* Define to 1 if you have the <strings.h> header file. */
#cmakedefine HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#cmakedefine HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#cmakedefine HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#cmakedefine HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#cmakedefine HAVE_UNISTD_H
/* Define if the Trilinos Amesos library is used. */
#cmakedefine HAVE_TRILINOS_AMESOS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment