Commit 1ff9b6c0 by Maarten L. Hekkelman

fix makefile

parents c1a51a1d bfbbeb90
...@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.23) ...@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.23)
# set the project name # set the project name
project( project(
libcifpp libcifpp
VERSION 7.0.4 VERSION 7.0.5
LANGUAGES CXX) LANGUAGES CXX)
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
...@@ -328,7 +328,7 @@ set(project_headers ...@@ -328,7 +328,7 @@ set(project_headers
include/cif++/validate.hpp include/cif++/validate.hpp
) )
add_library(cifpp STATIC) add_library(cifpp)
add_library(cifpp::cifpp ALIAS cifpp) add_library(cifpp::cifpp ALIAS cifpp)
target_sources(cifpp target_sources(cifpp
...@@ -489,13 +489,16 @@ install(EXPORT cifpp ...@@ -489,13 +489,16 @@ install(EXPORT cifpp
FILE "cifpp-targets.cmake" FILE "cifpp-targets.cmake"
DESTINATION lib/cmake/cifpp) DESTINATION lib/cmake/cifpp)
if(CIFPP_DATA_DIR AND CIFPP_DOWNLOAD_CCD)
install( install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ddl.dic FILES ${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ddl.dic
${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_pdbx.dic ${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_pdbx.dic
${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ma.dic ${COMPONENTS_CIF} ${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ma.dic
DESTINATION ${CMAKE_INSTALL_DATADIR}/libcifpp) DESTINATION ${CMAKE_INSTALL_DATADIR}/libcifpp)
endif()
if(CIFPP_DATA_DIR AND CIFPP_DOWNLOAD_CCD)
install(FILES ${COMPONENTS_CIF}
DESTINATION ${CMAKE_INSTALL_DATADIR}/libcifpp)
endif()
set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cifpp-config.cmake.in) set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cifpp-config.cmake.in)
......
...@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) ...@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
cif::file file = cif::pdb::read(argv[1]); cif::file file(argv[1]);
if (file.empty()) if (file.empty())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment