Merge branch 'trunk' of github.com:PDB-REDO/dssp into trunk

CMakeLists.txt

@@ -96,12 +96,7 @@ set(THREADS_PREFER_PTHREAD_FLAG)
 find_package(Threads)
 find_package(Threads)
 
 
 if(NOT PDB_REDO_META)
 if(NOT PDB_REDO_META)
-	find_package(libconfig QUIET)
-
-	if(NOT libconfig_FOUND)
-		add_subdirectory(libconfig EXCLUDE_FROM_ALL)
-	endif()
-
+	find_package(libcfp REQUIRED)
 	find_package(cifpp 5.0.4 REQUIRED)
 	find_package(cifpp 5.0.4 REQUIRED)
 endif()
 endif()
 
 
@@ -118,7 +113,7 @@ add_executable(mkdssp
 	$<TARGET_OBJECTS:dssp_library>)
 	$<TARGET_OBJECTS:dssp_library>)
 
 
 target_include_directories(mkdssp PRIVATE ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/date/include)
 target_include_directories(mkdssp PRIVATE ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/date/include)
-target_link_libraries(mkdssp PRIVATE dssp_library cifpp::cifpp libconfig::libconfig)
+target_link_libraries(mkdssp PRIVATE dssp_library cifpp::cifpp libcfp::libcfp)
 
 
 if(USE_RSRC)
 if(USE_RSRC)
 	message("Using resources compiled with ${MRC}")
 	message("Using resources compiled with ${MRC}")

src/mkdssp.cpp

@@ -33,7 +33,7 @@
 #include <fstream>
 #include <fstream>
 #include <iostream>
 #include <iostream>
 
 
-#include <cfg.hpp>
+#include <cfp/cfp.hpp>
 #include <cif++.hpp>
 #include <cif++.hpp>
 
 
 #include "DSSP.hpp"
 #include "DSSP.hpp"
@@ -66,22 +66,22 @@ int d_main(int argc, const char *argv[])
 {
 {
 	using namespace std::literals;
 	using namespace std::literals;
 
 
-	auto &config = cfg::config::instance();
+	auto &config = cfp::config::instance();
 
 
 	config.init("Usage: mkdssp [options] input-file [output-file]",
 	config.init("Usage: mkdssp [options] input-file [output-file]",
-		cfg::make_option<std::string>("output-format", "Output format, can be either 'dssp' for classic DSSP or 'mmcif' for annotated mmCIF. The default is chosen based on the extension of the output file, if any."),
-		cfg::make_option<short>("min-pp-stretch", 3, "Minimal number of residues having PSI/PHI in range for a PP helix, default is 3"),
-		cfg::make_option("write-other", "If set, write the type OTHER for loops, default is to leave this out"),
+		cfp::make_option<std::string>("output-format", "Output format, can be either 'dssp' for classic DSSP or 'mmcif' for annotated mmCIF. The default is chosen based on the extension of the output file, if any."),
+		cfp::make_option<short>("min-pp-stretch", 3, "Minimal number of residues having PSI/PHI in range for a PP helix, default is 3"),
+		cfp::make_option("write-other", "If set, write the type OTHER for loops, default is to leave this out"),
 
 
-		// cfg::make_option("components",			po::value<std::string,	"Location of the components.cif file from CCD")
-	    // cfg::make_option("extra-compounds",		po::value<std::string,	"File containing residue information for extra compounds in this specific target, should be either in CCD format or a CCP4 restraints file")
-		cfg::make_option<std::string>("mmcif-dictionary", "Path to the mmcif_pdbx.dic file to use instead of default"),
+		// cfp::make_option("components",			po::value<std::string,	"Location of the components.cif file from CCD")
+	    // cfp::make_option("extra-compounds",		po::value<std::string,	"File containing residue information for extra compounds in this specific target, should be either in CCD format or a CCP4 restraints file")
+		cfp::make_option<std::string>("mmcif-dictionary", "Path to the mmcif_pdbx.dic file to use instead of default"),
 
 
-		cfg::make_option("help,h", "Display help message"),
-		cfg::make_option("version", "Print version"),
-		cfg::make_option("verbose,v", "verbose output"),
+		cfp::make_option("help,h", "Display help message"),
+		cfp::make_option("version", "Print version"),
+		cfp::make_option("verbose,v", "verbose output"),
 
 
-		cfg::make_hidden_option<int>("debug,d", "Debug level (for even more verbose output)"));
+		cfp::make_hidden_option<int>("debug,d", "Debug level (for even more verbose output)"));
 
 
 	config.parse(argc, argv);
 	config.parse(argc, argv);