Merge branch 'cif2fasta-develop' into develop-cif2fasta

3315fae8 · Maarten L. Hekkelman · f1ca916d · d8c3c3f7 · 3315fae8 · 3315fae8
Commit 3315fae8 authored Jan 02, 2024 by Maarten L. Hekkelman
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CMakeLists.txt
+5 -0

src/pdb/pdb2cif.cpp
+0 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -537,6 +537,11 @@ write_basic_package_version_file(
  VERSION ${PROJECT_VERSION}
  COMPATIBILITY AnyNewerVersion)
+# In case we're included as sub_directory:
+if(NOT PROJECT_IS_TOP_LEVEL)
+	set(CIFPP_SHARE_DIR ${PROJECT_SOURCE_DIR}/rsrc PARENT_SCOPE)
+endif()
 if(BUILD_TESTING)
  # We're using the older version 2 of Catch2
  FetchContent_Declare(

--- a/src/pdb/pdb2cif.cpp
+++ b/src/pdb/pdb2cif.cpp