Build and install python plugin

CMakeLists.txt

@@ -25,7 +25,7 @@
 cmake_minimum_required(VERSION 3.23)
 
 # set the project name
-project(mkdssp VERSION 4.5.1 LANGUAGES CXX)
+project(mkdssp VERSION 4.5.2 LANGUAGES CXX)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 

libdssp/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Use the version of the parent list file, if any. May need a fix someday.
 if(NOT CMAKE_PARENT_LIST_FILE)
-	set(PROJECT_VERSION 4.5.0)
+	set(PROJECT_VERSION 4.5.2)
 endif()
 
 project(libdssp VERSION ${PROJECT_VERSION})
@@ -28,7 +28,7 @@ target_sources(dssp
 	FILES include/dssp.hpp
 )
 
-target_link_libraries(dssp PRIVATE cifpp::cifpp)
+target_link_libraries(dssp PUBLIC cifpp::cifpp)
 
 set_target_properties(dssp PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_features(dssp PUBLIC cxx_std_17)
@@ -42,7 +42,7 @@ target_include_directories(dssp
 # Install rules
 install(TARGETS dssp
 	EXPORT dssp
-	FILE_SET dssp_header DESTINATION "include")
+	FILE_SET dssp_header DESTINATION include)
 
 if(MSVC AND BUILD_SHARED_LIBS)
 	install(
@@ -52,25 +52,19 @@ if(MSVC AND BUILD_SHARED_LIBS)
 endif()
 
 install(EXPORT dssp
-	FILE "dsspTargets.cmake"
+	FILE "dssp-targets.cmake"
 	NAMESPACE dssp::
 	DESTINATION lib/cmake/dssp
 )
 
-set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dsspConfig.cmake.in)
+set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dssp-config.cmake.in)
 
 configure_package_config_file(
 	${CONFIG_TEMPLATE_FILE}
-	${CMAKE_CURRENT_BINARY_DIR}/dssp/dsspConfig.cmake
+	${CMAKE_CURRENT_BINARY_DIR}/dssp/dssp-config.cmake
 	INSTALL_DESTINATION lib/cmake/dssp
 )
 
-install(FILES
-	"${CMAKE_CURRENT_BINARY_DIR}/dssp/dsspConfig.cmake"
-	DESTINATION lib/cmake/dssp
-	COMPONENT Devel
-)
-
 set(dssp_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR})
 set_target_properties(dssp PROPERTIES
 	VERSION ${PROJECT_VERSION}
@@ -82,11 +76,19 @@ set_property(TARGET dssp APPEND PROPERTY
 )
 
 write_basic_package_version_file(
-	"${CMAKE_CURRENT_BINARY_DIR}/dssp/dsspConfigVersion.cmake"
+	"${CMAKE_CURRENT_BINARY_DIR}/dssp/dssp-config-version.cmake"
 	VERSION ${PROJECT_VERSION}
 	COMPATIBILITY AnyNewerVersion
 )
 
+install(FILES
+	"${CMAKE_CURRENT_BINARY_DIR}/dssp/dssp-config.cmake"
+	"${CMAKE_CURRENT_BINARY_DIR}/dssp/dssp-config-version.cmake"
+	DESTINATION lib/cmake/dssp
+	COMPONENT Devel
+)
+
+
 # set(CIFPP_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp")
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mmcif_pdbx/dssp-extension.dic"
         DESTINATION share/libcifpp)

libdssp/cmake/dssp-config.cmake.in

@@ -3,6 +3,6 @@
 include(CMakeFindDependencyMacro)
 find_dependency(cifpp REQUIRED)
 
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/dsspTargets.cmake")
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/dssp-targets.cmake")
 
 check_required_components(dssp)

python-module/CMakeLists.txt

@@ -1,9 +1,46 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2025 NKI/AVL, Netherlands Cancer Institute
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 find_package(Python REQUIRED COMPONENTS Interpreter Development)
 find_package(Boost REQUIRED COMPONENTS python)
 
-add_library(DSSP SHARED dssp-python-plugin.cpp)
+# ---------
 
-target_compile_features(DSSP PUBLIC cxx_std_20)
+add_library(mkdssp_module SHARED dssp-python-plugin.cpp)
 
-target_include_directories(DSSP PRIVATE ${Python_INCLUDE_DIRS})
-target_link_libraries(DSSP dssp::dssp Boost::python ${Python_LIBRARIES})
+target_compile_features(mkdssp_module PUBLIC cxx_std_20)
+
+target_include_directories(mkdssp_module PRIVATE ${Python_INCLUDE_DIRS})
+target_link_libraries(mkdssp_module dssp::dssp Boost::python ${Python_LIBRARIES})
+
+set_target_properties(mkdssp_module
+	PROPERTIES
+	PREFIX ""
+	OUTPUT_NAME mkdssp
+	LINKER_LANGUAGE CXX
+	LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+)
+
+install(TARGETS mkdssp_module LIBRARY DESTINATION "${Python_SITELIB}")