Commit 5c013dd4 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1292 Add Xtensor to the dependencies in CMake.

parent 9bd09a95
...@@ -55,6 +55,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Sources / ...@@ -55,6 +55,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Sources /
${PARMETIS_INCL_DIR} / ${PARMETIS_INCL_DIR} /
${LUA_INCL_DIR} / ${LUA_INCL_DIR} /
${BOOST_INCL_DIR} / ${BOOST_INCL_DIR} /
${XTENSOR_INCL_DIR} /
${LIBMESH_INCL_DIR} ${LIBMESH_INCL_DIR}
) )
......
...@@ -42,6 +42,8 @@ set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib dir ...@@ -42,6 +42,8 @@ set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib dir
set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.")
set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.")
set(XTENSOR_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Xtensor/include CACHE PATH "Include directory of Xtensor library.")
set(LIBMESH_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/include CACHE PATH "Include directory of Libmeshb library.") set(LIBMESH_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/include CACHE PATH "Include directory of Libmeshb library.")
set(LIBMESH_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/lib CACHE PATH "Lib directory of Libmeshb library.") set(LIBMESH_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/lib CACHE PATH "Lib directory of Libmeshb library.")
......
...@@ -42,6 +42,8 @@ set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib dir ...@@ -42,6 +42,8 @@ set(LUA_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Lua/lib CACHE PATH "Lib dir
set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.") set(BOOST_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/include CACHE PATH "Include directory of Boost library.")
set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.") set(BOOST_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Boost/lib CACHE PATH "Lib directory of Boost library.")
set(XTENSOR_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Xtensor/include CACHE PATH "Include directory of Xtensor library.")
set(LIBMESH_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/include CACHE PATH "Include directory of Libmeshb library.") set(LIBMESH_INCL_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/include CACHE PATH "Include directory of Libmeshb library.")
set(LIBMESH_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/lib CACHE PATH "Lib directory of Libmeshb library.") set(LIBMESH_LIB_DIR ${MOREFEM_THIRD_PARTY_LIBRARIES_DIR}/Libmeshb/lib CACHE PATH "Lib directory of Libmeshb library.")
......
...@@ -152,6 +152,7 @@ If you need to change a value which is not provided in this script input, you ma ...@@ -152,6 +152,7 @@ If you need to change a value which is not provided in this script input, you ma
'OPEN_MPI_INCL_DIR', 'OPEN_MPI_LIB_DIR', 'OPEN_MPI_INCL_DIR', 'OPEN_MPI_LIB_DIR',
'PETSC_INCL_DIR', 'PETSC_LIB_DIR', 'PETSC_INCL_DIR', 'PETSC_LIB_DIR',
'BOOST_INCL_DIR', 'BOOST_LIB_DIR', 'BOOST_INCL_DIR', 'BOOST_LIB_DIR',
'XTENSOR_INCL_DIR',
'LIBMESH_INCL_DIR', 'LIBMESH_LIB_DIR', 'LIBMESH_INCL_DIR', 'LIBMESH_LIB_DIR',
'LIBMESH_MAJOR_VERSION', 'LIBMESH_MAJOR_VERSION',
'LUA_INCL_DIR', 'LUA_LIB_DIR', 'LUA_INCL_DIR', 'LUA_LIB_DIR',
...@@ -341,6 +342,11 @@ If you need to change a value which is not provided in this script input, you ma ...@@ -341,6 +342,11 @@ If you need to change a value which is not provided in this script input, you ma
"PATH", "PATH",
"Path to the directory that contains the Boost library files.") "Path to the directory that contains the Boost library files.")
self._cache_entry("XTENSOR_INCL_DIR",
"PATH",
"Path to the directory that contains the Xtensor include files.")
self._cache_entry("LIBMESH_INCL_DIR", self._cache_entry("LIBMESH_INCL_DIR",
"PATH", "PATH",
"Path to the directory that contains the Libmesh include files.") "Path to the directory that contains the Libmesh include files.")
......
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