blob: d706950af59b02b8942fb10c344c68c01dbe1513 (
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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
From f964fc68b745cc200a1df9e442a2dd8e908f0248 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <kurt@kmk-computers.de>
Date: Sun, 8 Mar 2020 10:53:53 +0100
Subject: [PATCH] cmake: Disable use of HPX boost libraries
First of all the wrong variables are referenced. Second HPX doesn't include
date_time which is needed by the tracing writer. So that does not work.
Use the system boost libraries.
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
src/CMakeLists.txt | 60 +++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 38 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2870446108d0..f1a15abb0161 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,47 +2,31 @@
find_package(HPX)
-if(NOT HPX_FOUND)
- if(NOT DEFINED BOOST_ROOT)
- # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
- set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
- if(BOOST_ENV_LIBDIR)
- set(Boost_NO_SYSTEM_PATHS true)
- set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
- set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
- set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
- endif()
+if(NOT DEFINED BOOST_ROOT)
+ # deduce Boost location from environment (e.g. on woody.rrze.uni-erlangen.de)
+ set(BOOST_ENV_LIBDIR "$ENV{BOOST_LIBDIR}")
+ if(BOOST_ENV_LIBDIR)
+ set(Boost_NO_SYSTEM_PATHS true)
+ set(BOOST_ROOT "$ENV{BOOST_LIBDIR}/../")
+ set(Boost_LIBRARY_DIRS "$ENV{BOOST_LIBDIR}")
+ set(Boost_INCLUDE_DIR "$ENV{BOOST_INCDIR}")
endif()
-
- # mandatory Boost libs go into the first line, optional ones into
- # their own call. This avoids leaving out any available lib during
- # link time. The reason for this ugly multi-stage discovery is the
- # following: since CMAKE 2.8.11 each call to find_package(Boost...)
- # will reset Boost_LIBRARIES.
- find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
- set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
- find_package(Boost COMPONENTS serialization)
- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
- find_package(Boost COMPONENTS thread)
- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
- find_package(Boost COMPONENTS move)
- set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
-else()
- # If HPX was found, we use the Boost libraries found by HPX
- set(ALL_BOOST_LIBS
- ${HPX_BOOST_DATE_TIME_LIBRARY}
- ${HPX_BOOST_FILESYSTEM_LIBRARY}
- ${HPX_BOOST_SYSTEM_LIBRARY}
- ${HPX_BOOST_SERIALIZATION_LIBRARY}
- ${HPX_BOOST_THREAD_LIBRARY}
- )
- set(Boost_DATE_TIME_FOUND true)
- set(Boost_FILESYSTEM_FOUND true)
- set(Boost_SYSTEM_FOUND true)
- set(Boost_SERIALIZATION_FOUND true)
- set(Boost_THREAD_FOUND true)
endif()
+# mandatory Boost libs go into the first line, optional ones into
+# their own call. This avoids leaving out any available lib during
+# link time. The reason for this ugly multi-stage discovery is the
+# following: since CMAKE 2.8.11 each call to find_package(Boost...)
+# will reset Boost_LIBRARIES.
+find_package(Boost REQUIRED COMPONENTS date_time filesystem system)
+set(ALL_BOOST_LIBS "${Boost_LIBRARIES}")
+find_package(Boost COMPONENTS serialization)
+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+find_package(Boost COMPONENTS thread)
+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+find_package(Boost COMPONENTS move)
+set(ALL_BOOST_LIBS "${ALL_BOOST_LIBS};${Boost_LIBRARIES}")
+
find_package(Boost COMPONENTS mpi)
set(Boost_MPI_LIBRARIES "${Boost_LIBRARIES}")
--
2.24.1
|
GitWeb