Commit 05415c6a by Maarten L. Hekkelman

Fix writing version info

parent f30c6fa2
...@@ -115,7 +115,9 @@ if(NOT (libmcfp_FOUND OR TARGET libmcfp)) ...@@ -115,7 +115,9 @@ if(NOT (libmcfp_FOUND OR TARGET libmcfp))
endif() endif()
if(NOT TARGET cifpp AND NOT cifpp_FOUND) if(NOT TARGET cifpp AND NOT cifpp_FOUND)
find_package(cifpp 7 QUIET) include(FetchContent)
find_package(cifpp 7.0.7 QUIET)
if(NOT cifpp_FOUND) if(NOT cifpp_FOUND)
set(CIFPP_DOWNLOAD_CCD OFF) set(CIFPP_DOWNLOAD_CCD OFF)
...@@ -124,7 +126,7 @@ if(NOT TARGET cifpp AND NOT cifpp_FOUND) ...@@ -124,7 +126,7 @@ if(NOT TARGET cifpp AND NOT cifpp_FOUND)
cifpp cifpp
${EXLC} ${EXLC}
GIT_REPOSITORY https://github.com/pdb-redo/libcifpp.git GIT_REPOSITORY https://github.com/pdb-redo/libcifpp.git
GIT_TAG v7.0.3 GIT_TAG v7.0.7
) )
FetchContent_MakeAvailable(cifpp) FetchContent_MakeAvailable(cifpp)
...@@ -149,6 +151,22 @@ install(TARGETS ${PROJECT_NAME} ...@@ -149,6 +151,22 @@ install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
) )
if(NOT USE_RSRC)
# When building cifpp ourselves, we need to find where libcifpp
# expects the data files to be located.
if(TARGET cifpp)
get_target_property(DSSP_DATA_DIR cifpp CIFPP_DATA_DIR)
install(
FILES ${CIFPP_SHARE_DIR}/mmcif_pdbx.dic
${CIFPP_SHARE_DIR}/mmcif_ddl.dic
${CMAKE_CURRENT_SOURCE_DIR}/libdssp/mmcif_pdbx/dssp-extension.dic
DESTINATION ${DSSP_DATA_DIR})
else()
endif()
endif()
if(BUILD_DOCUMENTATION) if(BUILD_DOCUMENTATION)
add_subdirectory(doc) add_subdirectory(doc)
endif() endif()
......
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