Blob Blame History Raw
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55ceaaf2bc..f6409ffcc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,14 +29,6 @@ endif()
 enable_language(CXX)
 
 set(PROJECT_VERSION "4.1.0")
-string(REGEX
-       REPLACE "^([1-9]+)\\.[0-9]+.*$"
-               "\\1"
-               SOVERSION
-               "${PROJECT_VERSION}")
-if(NOT ${SOVERSION} MATCHES "^[1-9]+$")
-  message(FATAL_ERROR "Could not determine SOVERSION from ${PROJECT_VERSION}")
-endif(NOT ${SOVERSION} MATCHES "^[1-9]+$")
 
 #
 # CMake internal vars
diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
index cb0b3c6757..abe304110b 100644
--- a/doc/sphinx/conf.py.in
+++ b/doc/sphinx/conf.py.in
@@ -69,7 +69,7 @@ author = 'C. Holm, F. Weik, R. Weeber'
 # The short X.Y version.
 version = '@PROJECT_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@SOVERSION@'
+release = '@PROJECT_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
index 618e4e59c6..dd34cb4b97 100644
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -36,7 +36,6 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE}
 add_library(EspressoConfig SHARED config-features.cpp)
 add_dependencies(EspressoConfig myconfig check_myconfig generate_config_features)
 install(TARGETS EspressoConfig LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-set_target_properties(EspressoConfig PROPERTIES SOVERSION ${SOVERSION})
 target_include_directories(EspressoConfig PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 # Parse repository info from git if available
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index de03ad86f8..c956b9de16 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -158,7 +158,6 @@ else(CUDA)
 endif(CUDA)
 
 install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-set_target_properties(EspressoCore PROPERTIES SOVERSION ${SOVERSION})
 target_include_directories(EspressoCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 if(WITH_COVERAGE)
   target_compile_options(EspressoCore PUBLIC "$<$<CONFIG:Release>:-g>")
diff --git a/src/core/cluster_analysis/CMakeLists.txt b/src/core/cluster_analysis/CMakeLists.txt
index 354bdd8613..e7e0c22fef 100644
--- a/src/core/cluster_analysis/CMakeLists.txt
+++ b/src/core/cluster_analysis/CMakeLists.txt
@@ -4,7 +4,6 @@ set(cluster_analysis_SRC
 )
 add_library(cluster_analysis SHARED ${cluster_analysis_SRC})
 install(TARGETS cluster_analysis LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-set_target_properties(cluster_analysis PROPERTIES SOVERSION ${SOVERSION})
 set_target_properties(cluster_analysis PROPERTIES MACOSX_RPATH TRUE)
 target_link_libraries(cluster_analysis PUBLIC EspressoCore PRIVATE EspressoConfig)
 
diff --git a/src/core/io/mpiio/CMakeLists.txt b/src/core/io/mpiio/CMakeLists.txt
index 365c58295f..7c4b0dc422 100644
--- a/src/core/io/mpiio/CMakeLists.txt
+++ b/src/core/io/mpiio/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_library(mpiio SHARED mpiio.cpp)
 target_include_directories(mpiio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(mpiio PRIVATE EspressoConfig EspressoCore MPI::MPI_CXX)
+install(TARGETS mpiio LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
diff --git a/src/core/io/reader/CMakeLists.txt b/src/core/io/reader/CMakeLists.txt
index 1b9ee38735..6c2de627ac 100644
--- a/src/core/io/reader/CMakeLists.txt
+++ b/src/core/io/reader/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_library(pdbreader SHARED readpdb.cpp)
 target_link_libraries(pdbreader PUBLIC EspressoConfig EspressoCore pdbparser)
 target_include_directories(pdbreader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+install(TARGETS pdbreader LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
index 268172df6a..c0e78aeeb5 100644
--- a/src/core/shapes/CMakeLists.txt
+++ b/src/core/shapes/CMakeLists.txt
@@ -13,5 +13,4 @@ set(Shapes_SRC
 )
 add_library(Shapes SHARED ${Shapes_SRC})
 install(TARGETS Shapes LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-set_target_properties(Shapes PROPERTIES SOVERSION ${SOVERSION})
 target_link_libraries(Shapes PUBLIC EspressoConfig EspressoCore)
diff --git a/src/pdbparser/CMakeLists.txt b/src/pdbparser/CMakeLists.txt
index c58d79e8cb..3c4a66f1dc 100644
--- a/src/pdbparser/CMakeLists.txt
+++ b/src/pdbparser/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library(pdbparser SHARED ${CMAKE_CURRENT_SOURCE_DIR}/src/PdbParser.cpp)
 target_include_directories(pdbparser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+install(TARGETS pdbparser LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
 if(WITH_UNIT_TESTS)
   add_subdirectory(unit_tests)
 endif(WITH_UNIT_TESTS)
diff --git a/src/python/espressomd/CMakeLists.txt b/src/python/espressomd/CMakeLists.txt
index ebe76992da..59f2b8affc 100644
--- a/src/python/espressomd/CMakeLists.txt
+++ b/src/python/espressomd/CMakeLists.txt
@@ -107,6 +107,7 @@ foreach(cython_file ${cython_SRC})
       target_link_libraries(${target} PRIVATE EspressoConfig EspressoCore EspressoScriptInterface)
       target_include_directories(${target} SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
       add_dependencies(espressomd ${target})
+      install(TARGETS ${target} LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
   endif()
 endforeach()
 
@@ -124,6 +125,4 @@ foreach(auxfile ${cython_AUX})
 endforeach(auxfile)
 
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${PYTHON_INSTDIR}
-	PATTERN "CMakeFiles" EXCLUDE PATTERN "*.cpp" EXCLUDE
-	PATTERN "*.cmake" EXCLUDE PATTERN "Makefile" EXCLUDE) 
-
+	FILES_MATCHING PATTERN "*.py")
diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
index d28603f816..0a8966887f 100644
--- a/src/script_interface/CMakeLists.txt
+++ b/src/script_interface/CMakeLists.txt
@@ -33,7 +33,6 @@ endif()
 
 add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
 install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${PYTHON_INSTDIR}/espressomd)
-set_target_properties(EspressoScriptInterface PROPERTIES SOVERSION ${SOVERSION})
 target_link_libraries(EspressoScriptInterface PRIVATE EspressoConfig PUBLIC EspressoCore Shapes cluster_analysis mpiio pdbreader)
 if(HDF5_FOUND)
  target_link_libraries(EspressoScriptInterface PRIVATE H5mdCore)