From 8bb453093aaa140f27b85fa644e7ac458460a8de Mon Sep 17 00:00:00 2001
From: Sebastien Gilles <sebastien.gilles@inria.fr>
Date: Tue, 29 May 2018 11:13:26 +0200
Subject: [PATCH] #1293 Changes in configuration files for the paths of Petsc
include files (due to the fact we now use installed library).
---
CMakeLists.txt | 5 ++---
XCodeConfig/morefem_common.xcconfig | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a30888e64..2218cfb8c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.
# ===================================================================================================================
-if (NOT PETSC_GENERAL_INCL_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.")
+if (NOT OPEN_MPI_LIB_DIR)
+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()
if(MOREFEM_CHECK_UPDATE_GHOSTS_CALL_RELEVANCE)
@@ -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/Seldon /
${OPEN_MPI_INCL_DIR} /
- ${PETSC_GENERAL_INCL_DIR} /
${PETSC_SPECIFIC_INCL_DIR} /
${PARMETIS_INCL_DIR} /
${LUA_INCL_DIR} /
diff --git a/XCodeConfig/morefem_common.xcconfig b/XCodeConfig/morefem_common.xcconfig
index 35c8af1381..8782f7f24c 100644
--- a/XCodeConfig/morefem_common.xcconfig
+++ b/XCodeConfig/morefem_common.xcconfig
@@ -14,7 +14,7 @@ MOREFEM_SRC = ${MOREFEM_ROOT}/Sources
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
--
GitLab