Should always install libcifpp

ce2786aa · Maarten L. Hekkelman · 26b84ef4 · ce2786aa · cfd5b7da
Commit ce2786aa authored Oct 25, 2022 by Maarten L. Hekkelman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

CMakeLists.txt
+2 -5

libcifpp
+0 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,10 +108,7 @@ if(NOT gxrio_FOUND)
 	add_git_submodule(gxrio EXCLUDE_FROM_ALL)
 endif()

-find_package(cifpp 5.0.0 QUIET)
-if(NOT cifpp_FOUND)
-	add_git_submodule(libcifpp EXCLUDE_FROM_ALL)
-endif()
+find_package(cifpp 5.0.0 REQUIRED)

 add_git_submodule(date EXCLUDE_FROM_ALL)

@@ -133,7 +130,7 @@ add_executable(mkdssp
 	$<TARGET_OBJECTS:dssp_library>)

 target_include_directories(mkdssp PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(mkdssp PRIVATE dssp_library cifpp::cifpp date::date libconfig::libconfig)
+target_link_libraries(mkdssp PRIVATE dssp_library cifpp::cifpp date::date libconfig::libconfig gxrio::gxrio)

 if(USE_RSRC)
 	mrc_target_resources(mkdssp ${CIFPP_SHARE_DIR}/mmcif_pdbx.dic)

--- a/libcifpp @ cfd5b7da
+++ b/libcifpp @ cfd5b7da
-Subproject commit cfd5b7da0f936de740cb78c065ebd045ab1c2192