Fix installation issues, version bump

CMakeLists.txt

@@ -25,7 +25,7 @@
 cmake_minimum_required(VERSION 3.16)
 cmake_minimum_required(VERSION 3.16)
 
 
 # set the project name
 # set the project name
-project(cifpp VERSION 5.0.2 LANGUAGES CXX)
+project(cifpp VERSION 5.0.3 LANGUAGES CXX)
 
 
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
@@ -300,15 +300,14 @@ if(CIFPP_DOWNLOAD_CCD)
 endif()
 endif()
 
 
 # Installation directories
 # Installation directories
-set(CIFPP_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(CIFPP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-set(CIFPP_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libcifpp")
-set(CIFPP_ETC_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}")
-
+set(CIFPP_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp")
 target_compile_definitions(cifpp PUBLIC DATA_DIR="${CIFPP_DATA_DIR}")
 target_compile_definitions(cifpp PUBLIC DATA_DIR="${CIFPP_DATA_DIR}")
+
 if(UNIX)
 if(UNIX)
-	set(CIFPP_CACHE_DIR "/var/cache/libcifpp" CACHE STRING "The cache directory to use")
+	set(CIFPP_CACHE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/cache/libcifpp")
 	target_compile_definitions(cifpp PUBLIC CACHE_DIR="${CIFPP_CACHE_DIR}")
 	target_compile_definitions(cifpp PUBLIC CACHE_DIR="${CIFPP_CACHE_DIR}")
+
+	set(CIFPP_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
 endif()
 endif()
 
 
 # Install rules
 # Install rules
@@ -358,7 +357,6 @@ configure_package_config_file(
 	${CONFIG_TEMPLATE_FILE}
 	${CONFIG_TEMPLATE_FILE}
 	${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake
 	${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake
 	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cifpp
 	INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cifpp
-	PATH_VARS CIFPP_INCLUDE_DIR CIFPP_LIB_DIR CIFPP_DATA_DIR
 )
 )
 
 
 install(FILES
 install(FILES
@@ -459,7 +457,7 @@ set(CPACK_SOURCE_TGZ ON)
 set(CPACK_SOURCE_TBZ2 OFF)
 set(CPACK_SOURCE_TBZ2 OFF)
 set(CPACK_SOURCE_TXZ OFF)
 set(CPACK_SOURCE_TXZ OFF)
 set(CPACK_SOURCE_TZ OFF)
 set(CPACK_SOURCE_TZ OFF)
-set(CPACK_SOURCE_IGNORE_FILES "/data/components.cif;/build;/.vscode;/.git;/regex")
+set(CPACK_SOURCE_IGNORE_FILES "/data/components.cif;/build;/.vscode;/.git")
 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 include(CPack)
 include(CPack)

changelog

+Version 5.0.3
+- Fix installation of libcifpp into the correct locations
+
 Version 5.0.2
 Version 5.0.2
 - Fix export of CISPEP records in PDB format
 - Fix export of CISPEP records in PDB format
 - Better support for exporting package_source
 - Better support for exporting package_source

cmake/cifppConfig.cmake.in

@@ -8,8 +8,4 @@ find_dependency(LibLZMA REQUIRED)
 
 
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
 
 
-set_and_check(CIFPP_INCLUDE_DIR "@PACKAGE_CIFPP_INCLUDE_DIR@")
-set_and_check(CIFPP_LIBRARY_DIR "@PACKAGE_CIFPP_LIB_DIR@")
-set_and_check(CIFPP_SHARE_DIR "@PACKAGE_CIFPP_DATA_DIR@")
-
 check_required_components(cifpp)
 check_required_components(cifpp)

tools/update-libcifpp-data.in

@@ -7,8 +7,8 @@ if [ "$EUID" -ne 0 ]
 	exit
 	exit
 fi
 fi
 
 
-if [ -f /etc/libcifpp.conf ] ; then
-	. /etc/libcifpp.conf
+if [ -f @CIFPP_ETC_DIR@/libcifpp.conf ] ; then
+	. @CIFPP_ETC_DIR@/libcifpp.conf
 fi
 fi
 
 
 # check to see if we're supposed to run at all
 # check to see if we're supposed to run at all
@@ -48,8 +48,8 @@ fetch_dictionary "@CIFPP_CACHE_DIR@/components.cif" "ftp://ftp.wwpdb.org/pub/pdb
 
 
 # notify subscribers
 # notify subscribers
 
 
-if [ -d /etc/libcifpp/cache-update.d ] && [ -x /bin/run-parts ]; then
-	run-parts --arg "@CIFPP_CACHE_DIR@" -- /etc/libcifpp/cache-update.d
+if [ -d @CIFPP_ETC_DIR@/libcifpp/cache-update.d ] && [ -x /bin/run-parts ]; then
+	run-parts --arg "@CIFPP_CACHE_DIR@" -- @CIFPP_ETC_DIR@/libcifpp/cache-update.d
 fi
 fi
 
 
 wget -O/var/cache/libcifpp/mmcif_ma.dic "https://github.com/ihmwg/ModelCIF/raw/master/dist/mmcif_ma.dic"
 wget -O/var/cache/libcifpp/mmcif_ma.dic "https://github.com/ihmwg/ModelCIF/raw/master/dist/mmcif_ma.dic"