depython_main_build
authorDebian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Fri, 26 Oct 2018 03:45:58 +0000 (11:45 +0800)
committerDrew Parsons <dparsons@debian.org>
Fri, 26 Oct 2018 03:45:58 +0000 (11:45 +0800)
===================================================================

Gbp-Pq: Name depython_main_build.patch

CMakeLists.txt

index bdac6506ebc578c1189ef1b606fa78972628cf66..21df14a8541462b30e59e0ff632a6570613c8fad 100644 (file)
@@ -91,7 +91,6 @@ include_directories(BEFORE ${EXTERNAL_INCLUDE_DIRS})
 add_definitions("${EXTERNAL_DEFINITIONS}")
 
 find_package(DOLFIN REQUIRED)
-include_directories(${DOLFIN_PYTHON_INCLUDE_DIRS})
 include(${DOLFIN_USE_FILE})
 
 # Set installation directories
@@ -196,8 +195,8 @@ file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR
 ### add cmake configuration file ###
 
 # common for both config files
-set(CONF_EXTERNAL_INCLUDE_DIRS "${DOLFIN_PYTHON_INCLUDE_DIRS};${DOLFIN_INCLUDE_DIRS};${DOLFIN_3RD_PARTY_INCLUDE_DIRS}")
-set(CONF_EXTERNAL_LIBRARIES "${DOLFIN_PYTHON_LIBRARIES};${DOLFIN_LIBRARIES};${DOLFIN_3RD_PARTY_LIBRARIES}")
+set(CONF_EXTERNAL_INCLUDE_DIRS "${DOLFIN_INCLUDE_DIRS};${DOLFIN_3RD_PARTY_INCLUDE_DIRS}")
+set(CONF_EXTERNAL_LIBRARIES "${DOLFIN_LIBRARIES};${DOLFIN_3RD_PARTY_LIBRARIES}")
 set(CONF_CXX_DEFINITIONS "${DOLFIN_CXX_DEFINITIONS}")
 string(REPLACE "\"" "\\\"" CONF_CXX_DEFINITIONS "${CONF_CXX_DEFINITIONS}")
 set(CONF_CXX_FLAGS "${DOLFIN_CXX_FLAGS}")