summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Junghans <junghans@votca.org>2017-03-04 22:58:23 -0700
committerChristoph Junghans <junghans@votca.org>2017-03-04 22:58:23 -0700
commit2f549b159d1ee312b8421393161764f41d716ce1 (patch)
tree911b7989ea6a0fe7cf5611963691f829fbff5218
parent36eae236e5abf92aee337fc6cdcde07cfda7d3fa (diff)
downloadfedora-review-2f549b159d1ee312b8421393161764f41d716ce1.zip
fedora-review-2f549b159d1ee312b8421393161764f41d716ce1.tar.gz
fedora-review-2f549b159d1ee312b8421393161764f41d716ce1.tar.xz
espresso: update patch
-rw-r--r--espresso/1056.patch135
-rw-r--r--espresso/espresso.spec2
2 files changed, 114 insertions, 23 deletions
diff --git a/espresso/1056.patch b/espresso/1056.patch
index 97440ea..8bab8b0 100644
--- a/espresso/1056.patch
+++ b/espresso/1056.patch
@@ -1,75 +1,168 @@
-From 6eaa18a0ff53430266bee3d8bf99a58ff8571ab0 Mon Sep 17 00:00:00 2001
+From 749176104289d7e56f1ee38ca615b0521c42a085 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 libraries
+Subject: [PATCH] cmake: install all shared libs in pymodule path
---
- src/core/constraints/CMakeLists.txt | 1 +
- src/core/correlators/CMakeLists.txt | 1 +
- src/core/observables/CMakeLists.txt | 1 +
- src/core/shapes/CMakeLists.txt | 1 +
- src/core/utils/CMakeLists.txt | 1 +
- src/script_interface/CMakeLists.txt | 1 +
- 6 files changed, 6 insertions(+)
+ src/core/CMakeLists.txt | 4 ++--
+ src/core/actor/CMakeLists.txt | 4 ++--
+ src/core/constraints/CMakeLists.txt | 1 +
+ src/core/correlators/CMakeLists.txt | 1 +
+ src/core/immersed_boundary/CMakeLists.txt | 4 ++--
+ src/core/object-in-fluid/CMakeLists.txt | 2 +-
+ src/core/observables/CMakeLists.txt | 1 +
+ src/core/scafacos/CMakeLists.txt | 2 +-
+ src/core/shapes/CMakeLists.txt | 1 +
+ src/core/utils/CMakeLists.txt | 1 +
+ src/script_interface/CMakeLists.txt | 1 +
+ 11 files changed, 14 insertions(+), 8 deletions(-)
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 9982a54..79eb6a6 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -23,7 +23,7 @@ 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 ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(EspressoCore EspressoConfig)
+
+ target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
+@@ -43,7 +43,7 @@ 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 ${PYTHON_INSTDIR}/espressomd)
+ 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..e4de1da 100644
+--- a/src/core/actor/CMakeLists.txt
++++ b/src/core/actor/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ 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 ${PYTHON_INSTDIR}/espressomd ARCHIVE DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(Actor EspressoConfig)
+
+ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
+@@ -9,7 +9,7 @@ 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 ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(ActorCuda EspressoConfig)
+
+ add_dependencies(Actor ActorCuda)
diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
-index 0f5c043..0f34745 100644
+index 0f5c043..797d3fb 100644
--- a/src/core/constraints/CMakeLists.txt
+++ b/src/core/constraints/CMakeLists.txt
@@ -1,4 +1,5 @@
file(GLOB Constraints_SRC Constraint.cpp)
add_library(Constraints SHARED ${Constraints_SRC})
-+install(TARGETS Constraints LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Constraints LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
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..a8d426e 100644
+index c5ff02f..c6ec5ee 100644
--- a/src/core/correlators/CMakeLists.txt
+++ b/src/core/correlators/CMakeLists.txt
@@ -1,4 +1,5 @@
file(GLOB Correlators_SRC *.?pp)
add_library(Correlators SHARED ${Correlators_SRC})
-+install(TARGETS Correlators LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Correlators LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
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..6d90e5d 100644
+--- a/src/core/immersed_boundary/CMakeLists.txt
++++ b/src/core/immersed_boundary/CMakeLists.txt
+@@ -1,13 +1,13 @@
+ 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 ${PYTHON_INSTDIR}/espressomd ARCHIVE DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ 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 ${PYTHON_INSTDIR}/espressomd)
+ 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..e5aba19 100644
+--- a/src/core/object-in-fluid/CMakeLists.txt
++++ b/src/core/object-in-fluid/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ 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 ${PYTHON_INSTDIR}/espressomd ARCHIVE DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ 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..2b1a29a 100644
+index 9813d86..7c71df0 100644
--- a/src/core/observables/CMakeLists.txt
+++ b/src/core/observables/CMakeLists.txt
@@ -1,4 +1,5 @@
file(GLOB Observables_SRC *.?pp)
add_library(Observables SHARED ${Observables_SRC})
-+install(TARGETS Observables LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Observables LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
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..de10452 100644
+index 0e5ecaa..06e243e 100644
--- a/src/core/shapes/CMakeLists.txt
+++ b/src/core/shapes/CMakeLists.txt
@@ -1,4 +1,5 @@
file(GLOB Shapes_SRC *.cpp)
add_library(Shapes SHARED ${Shapes_SRC})
-+install(TARGETS Shapes LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Shapes LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
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..071c23b 100644
+index ec0f6f7..72b9ef5 100644
--- a/src/core/utils/CMakeLists.txt
+++ b/src/core/utils/CMakeLists.txt
@@ -1,3 +1,4 @@
file(GLOB EspressoUtils_SRC *.cpp)
add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
-+install(TARGETS EspressoUtils LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS EspressoUtils LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
-index 8aff034..9b099fe 100644
+index 8aff034..55d56fc 100644
--- a/src/script_interface/CMakeLists.txt
+++ b/src/script_interface/CMakeLists.txt
@@ -28,6 +28,7 @@ if(H5MD)
)
endif(H5MD)
add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
-+install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
target_link_libraries(EspressoScriptInterface EspressoCore)
diff --git a/espresso/espresso.spec b/espresso/espresso.spec
index 200ae68..323f610 100644
--- a/espresso/espresso.spec
+++ b/espresso/espresso.spec
@@ -196,11 +196,9 @@ popd
%license COPYING
%files -n python2-%{name}-openmpi
-%{python_sitearch}/openmpi/lib*.so
%{python_sitearch}/openmpi/%{name}md
%files -n python2-%{name}-mpich
-%{python_sitearch}/mpich/lib*.so
%{python_sitearch}/mpich/%{name}md
%changelog