Commit 8bb45309 authored by GILLES Sebastien's avatar GILLES Sebastien

#1293 Changes in configuration files for the paths of Petsc include files (due...

#1293 Changes in configuration files for the paths of Petsc include files (due to the fact we now use installed library).
parent b98bb346
...@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.8) ...@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.8)
# Include a file with default setting. Some of them might be overriden by command line, such as the C or C++ compiler. # Include a file with default setting. Some of them might be overriden by command line, such as the C or C++ compiler.
# =================================================================================================================== # ===================================================================================================================
if (NOT PETSC_GENERAL_INCL_DIR) if (NOT OPEN_MPI_LIB_DIR)
message(FATAL_ERROR "PETSC_GENERAL_INCL_DIR was not found; the recommended way to build MoReFEM is to provide a setting file that provide many cache values with -C, e.g. cmake -C ../cmake/Settings/clang_shared_lib.cmake.") message(FATAL_ERROR "OPEN_MPI_LIB_DIR was not found; the recommended way to build MoReFEM is to provide a setting file that provide many cache values with -C, e.g. cmake -C ../cmake/Settings/clang_shared_lib.cmake.")
endif() endif()
if(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE) if(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE)
...@@ -58,7 +58,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Sources / ...@@ -58,7 +58,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Sources /
${CMAKE_CURRENT_SOURCE_DIR}/Sources/ThirdParty/Source/Tclap/include / ${CMAKE_CURRENT_SOURCE_DIR}/Sources/ThirdParty/Source/Tclap/include /
${CMAKE_CURRENT_SOURCE_DIR}/Sources/ThirdParty/Source/Seldon / ${CMAKE_CURRENT_SOURCE_DIR}/Sources/ThirdParty/Source/Seldon /
${OPEN_MPI_INCL_DIR} / ${OPEN_MPI_INCL_DIR} /
${PETSC_GENERAL_INCL_DIR} /
${PETSC_SPECIFIC_INCL_DIR} / ${PETSC_SPECIFIC_INCL_DIR} /
${PARMETIS_INCL_DIR} / ${PARMETIS_INCL_DIR} /
${LUA_INCL_DIR} / ${LUA_INCL_DIR} /
......
...@@ -14,7 +14,7 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources ...@@ -14,7 +14,7 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources
THIRD_PARTY_LIBRARY_DIR = /Volumes/Data/opt THIRD_PARTY_LIBRARY_DIR = /Volumes/Data/opt
HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${THIRD_PARTY_LIBRARY_DIR}/Boost/include ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include HEADER_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/include ${THIRD_PARTY_LIBRARY_DIR}/Petsc/include ${THIRD_PARTY_LIBRARY_DIR}/Lua/include ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/include ${MOREFEM_SRC}/ThirdParty/Source/Seldon ${THIRD_PARTY_LIBRARY_DIR}/Boost/include ${MOREFEM_SRC}/ThirdParty/Source/Tclap/include ${THIRD_PARTY_LIBRARY_DIR}/QuantStack/include
LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/lib LIBRARY_SEARCH_PATHS_COMMON = ${THIRD_PARTY_LIBRARY_DIR} ${THIRD_PARTY_LIBRARY_DIR}/Openmpi/lib ${THIRD_PARTY_LIBRARY_DIR}/Lua/lib ${THIRD_PARTY_LIBRARY_DIR}/Parmetis/lib ${THIRD_PARTY_LIBRARY_DIR}/Boost/lib
......
Markdown is supported
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