blob: 036fe68d6fc1ac7eb250195a2e74006642dd7e66 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff --git a/src/dolfin/CMakeLists.txt b/src/dolfin/CMakeLists.txt
index afb33ce..96a5460 100644
--- a/src/dolfin/CMakeLists.txt
+++ b/src/dolfin/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
# Set location of our FindFoo.cmake modules
set(DOLFIN_CMAKE_DIR "${DOLFIN_SOURCE_DIR}/cmake" CACHE INTERNAL "")
-set(CMAKE_MODULE_PATH "${DOLFIN_CMAKE_DIR}/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${DOLFIN_CMAKE_DIR}/modules")
# Make sure CMake uses the correct DOLFINConfig.cmake for tests and demos
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_CURRENT_BINARY_DIR}/dolfin)
diff --git a/src/dolfin/cmake/modules/FindPaStiX.cmake b/src/dolfin/cmake/modules/FindPaStiX.cmake
index be2f60a..6b2566a 100644
--- a/src/dolfin/cmake/modules/FindPaStiX.cmake
+++ b/src/dolfin/cmake/modules/FindPaStiX.cmake
@@ -123,6 +123,8 @@ elseif (PASTIX_INCLUDE_DIRS AND PASTIX_LIBRARIES)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${MPI_C_COMPILE_FLAGS}")
endif()
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "-lpastix -llapack -lbz2 -lptscotch -lscotcherr")
+
# Build and run test program
include(CheckCSourceRuns)
check_c_source_runs("
diff --git a/src/dolfin/cmake/modules/FindSCOTCH.cmake b/src/dolfin/cmake/modules/FindSCOTCH.cmake
index 58b96b4..97d7264 100644
--- a/src/dolfin/cmake/modules/FindSCOTCH.cmake
+++ b/src/dolfin/cmake/modules/FindSCOTCH.cmake
@@ -159,6 +159,14 @@ elseif (SCOTCH_INCLUDE_DIRS AND SCOTCH_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${SCOTCH_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${SCOTCH_LIBRARIES})
#set(CMAKE_REQUIRED_LIBRARIES ${SCOTCH_LIBRARY} ${SCOTCHERR_LIBRARY})
+ # TODO: see if scotch was built against bzip2 before finding
+ # nm --dynamic /usr/lib/libscotch.so | grep -w BZ2_bzRead
+ if (NOT BZIP2_FOUND)
+ find_package(BZip2)
+ endif()
+ if (BZIP2_FOUND)
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
+ endif()
# Add MPI variables if MPI has been found
if (MPI_CXX_FOUND)
|