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
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
From 41ed46726836f1dd654d9c771127f9c14c2304a3 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Fri, 3 Mar 2017 16:05:45 -0700
Subject: [PATCH] cmake: install all shared libs in back in libdir
some libraries weren't installed and the python module path
isn't in the LD_LIBRARY_PATH and hence partly revert
80ad49e954f4a6590707fd86e4fd586682ad626d
---
CMakeLists.txt | 8 ++++++++
src/core/CMakeLists.txt | 6 ++++--
src/core/actor/CMakeLists.txt | 6 ++++--
src/core/constraints/CMakeLists.txt | 2 ++
src/core/correlators/CMakeLists.txt | 2 ++
src/core/immersed_boundary/CMakeLists.txt | 6 ++++--
src/core/object-in-fluid/CMakeLists.txt | 3 ++-
src/core/observables/CMakeLists.txt | 2 ++
src/core/scafacos/CMakeLists.txt | 2 +-
src/core/shapes/CMakeLists.txt | 2 ++
src/core/utils/CMakeLists.txt | 2 ++
src/script_interface/CMakeLists.txt | 2 ++
12 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf49c40..8b20b57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,10 @@ project(ESPResSo)
enable_language(CXX)
set(PROJECT_VERSION "4.0-dev")
+string(REGEX REPLACE "^([1-9]+)\\.[0-9]+.*$" "\\1" SOVERSION "${PROJECT_VERSION}")
+if (NOT ${SOVERSION} MATCHES "^[1-9]+$")
+ message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}")
+endif (NOT ${SOVERSION} MATCHES "^[1-9]+$")
######################################################################
# CMake internal vars
@@ -238,6 +242,10 @@ if (NOT DEFINED DATA)
set(DATA "share/espresso")
endif(NOT DEFINED DATA)
+if (NOT DEFINED LIBDIR)
+ set(LIBDIR "lib")
+endif(NOT DEFINED LIBDIR)
+
if (NOT DEFINED BINDIR)
set(BINDIR "bin")
endif(NOT DEFINED BINDIR)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 9982a54..1ff96ed 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -23,7 +23,8 @@ add_custom_target(EspressoConfig DEPENDS config-features.hpp config-features.cpp
add_dependencies(EspressoConfig myconfig)
add_library(EspressoCore SHARED ${EspressoCore_SRC} config-features.cpp config-version.cpp)
-install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR})
+install(TARGETS EspressoCore LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(EspressoCore PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(EspressoCore EspressoConfig)
target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
@@ -43,7 +44,8 @@ if(CUDA)
cuda_include_directories(${CMAKE_CURRENT_BINARY_DIR})
cuda_add_library(EspressoCuda SHARED ${EspressoCuda_SRC})
- install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR})
+ install(TARGETS EspressoCuda DESTINATION ${LIBDIR})
+ set_target_properties(EspressoCuda PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(EspressoCuda EspressoConfig)
set_target_properties(EspressoCuda PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/actor/CMakeLists.txt b/src/core/actor/CMakeLists.txt
index 0421243..274c412 100644
--- a/src/core/actor/CMakeLists.txt
+++ b/src/core/actor/CMakeLists.txt
@@ -1,7 +1,8 @@
file(GLOB Actor_SRC *.cpp)
add_library(Actor SHARED ${Actor_SRC})
-install(TARGETS Actor LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
+install(TARGETS Actor LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+set_target_properties(Actor PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(Actor EspressoConfig)
set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
@@ -9,7 +10,8 @@ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
if(CUDA)
file(GLOB ActorCuda_SRC *.cu)
cuda_add_library(ActorCuda SHARED ${ActorCuda_SRC})
- install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR})
+ install(TARGETS ActorCuda DESTINATION ${LIBDIR})
+ set_target_properties(ActorCuda PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(ActorCuda EspressoConfig)
add_dependencies(Actor ActorCuda)
diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
index 0f5c043..5bb414c 100644
--- a/src/core/constraints/CMakeLists.txt
+++ b/src/core/constraints/CMakeLists.txt
@@ -1,4 +1,6 @@
file(GLOB Constraints_SRC Constraint.cpp)
add_library(Constraints SHARED ${Constraints_SRC})
+install(TARGETS Constraints LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(Constraints PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(Constraints EspressoConfig)
set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
index c5ff02f..3eaf37f 100644
--- a/src/core/correlators/CMakeLists.txt
+++ b/src/core/correlators/CMakeLists.txt
@@ -1,4 +1,6 @@
file(GLOB Correlators_SRC *.?pp)
add_library(Correlators SHARED ${Correlators_SRC})
+install(TARGETS Correlators LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(Correlators PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(Correlators EspressoConfig)
set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/immersed_boundary/CMakeLists.txt b/src/core/immersed_boundary/CMakeLists.txt
index ec7fb85..d41473e 100644
--- a/src/core/immersed_boundary/CMakeLists.txt
+++ b/src/core/immersed_boundary/CMakeLists.txt
@@ -1,13 +1,15 @@
file(GLOB ImmersedBoundary_SRC *.cpp)
add_library(ImmersedBoundary SHARED ${ImmersedBoundary_SRC})
set_target_properties(ImmersedBoundary PROPERTIES MACOSX_RPATH TRUE)
-install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
+install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+set_target_properties(ImmersedBoundary PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(ImmersedBoundary EspressoConfig)
if(CUDA)
file(GLOB ImmersedBoundaryCuda_SRC *.cu)
cuda_add_library(ImmersedBoundaryCuda SHARED ${ImmersedBoundaryCuda_SRC})
- install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR})
+ install(TARGETS ImmersedBoundaryCuda DESTINATION ${LIBDIR})
+ set_target_properties(ImmersedBoundaryCuda PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(ImmersedBoundaryCuda EspressoConfig)
set_target_properties(ImmersedBoundaryCuda PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/object-in-fluid/CMakeLists.txt b/src/core/object-in-fluid/CMakeLists.txt
index 7154486..cb64b91 100644
--- a/src/core/object-in-fluid/CMakeLists.txt
+++ b/src/core/object-in-fluid/CMakeLists.txt
@@ -1,5 +1,6 @@
file(GLOB ObjectInFluid_SRC *.cpp)
add_library(ObjectInFluid SHARED ${ObjectInFluid_SRC})
-install(TARGETS ObjectInFluid LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
+install(TARGETS ObjectInFluid LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+set_target_properties(ObjectInFluid PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(ObjectInFluid EspressoConfig)
set_target_properties(ObjectInFluid PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
index 9813d86..573a362 100644
--- a/src/core/observables/CMakeLists.txt
+++ b/src/core/observables/CMakeLists.txt
@@ -1,4 +1,6 @@
file(GLOB Observables_SRC *.?pp)
add_library(Observables SHARED ${Observables_SRC})
+install(TARGETS Observables LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(Observables PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(Observables EspressoConfig)
set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/scafacos/CMakeLists.txt b/src/core/scafacos/CMakeLists.txt
index 1479683..3028ca0 100644
--- a/src/core/scafacos/CMakeLists.txt
+++ b/src/core/scafacos/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${SCAFACOS_INCLUDE_DIRS})
file(GLOB Scafacos_SRC *.cpp)
add_library(Scafacos SHARED ${Scafacos_SRC})
-install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR})
+install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR}/espressomd)
add_dependencies(Scafacos EspressoConfig)
target_link_libraries(Scafacos ${SCAFACOS_LDFLAGS})
diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
index 0e5ecaa..b1779a9 100644
--- a/src/core/shapes/CMakeLists.txt
+++ b/src/core/shapes/CMakeLists.txt
@@ -1,4 +1,6 @@
file(GLOB Shapes_SRC *.cpp)
add_library(Shapes SHARED ${Shapes_SRC})
+install(TARGETS Shapes LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(Shapes PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(Shapes EspressoConfig)
set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
index ec0f6f7..f1f76e4 100644
--- a/src/core/utils/CMakeLists.txt
+++ b/src/core/utils/CMakeLists.txt
@@ -1,3 +1,5 @@
file(GLOB EspressoUtils_SRC *.cpp)
add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
+install(TARGETS EspressoUtils LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(EspressoUtils PROPERTIES SOVERSION ${SOVERSION})
set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
index 8aff034..259e8ee 100644
--- a/src/script_interface/CMakeLists.txt
+++ b/src/script_interface/CMakeLists.txt
@@ -28,6 +28,8 @@ if(H5MD)
)
endif(H5MD)
add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
+install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${LIBDIR})
+set_target_properties(EspressoScriptInterface PROPERTIES SOVERSION ${SOVERSION})
add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
target_link_libraries(EspressoScriptInterface EspressoCore)
--
2.10.2
|
