libconfig

CMakeLists.txt

@@ -103,7 +103,9 @@ set(CMAKE_THREAD_PREFER_PTHREAD)
 set(THREADS_PREFER_PTHREAD_FLAG)
 find_package(Threads)
 
+find_package(libconfig REQUIRED)
 find_package(gxrio QUIET)
+
 if(NOT gxrio_FOUND)
 	add_git_submodule(gxrio EXCLUDE_FROM_ALL)
 endif()
@@ -112,11 +114,6 @@ find_package(cifpp 5.0.0 REQUIRED)
 
 add_git_submodule(date EXCLUDE_FROM_ALL)
 
-find_package(libconfig QUIET)
-if(NOT libconfig_FOUND)
-	add_git_submodule(libconfig EXCLUDE_FROM_ALL)
-endif()
-
 # The DSSP code is in a separate library, optionally to be used by others
 add_library(dssp_library OBJECT ${PROJECT_SOURCE_DIR}/src/DSSP.cpp)
 add_library(dssp::dssp ALIAS dssp_library)

libconfig @ f7b04e8a

-Subproject commit f7b04e8a2f75230b2726f4deda7d81c86d15f3e3

src/mkdssp.cpp

@@ -70,7 +70,7 @@ int d_main(int argc, const char *argv[])
 
 	auto &config = cfg::config::instance();
 
-	config.init(
+	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"),
@@ -97,9 +97,7 @@ int d_main(int argc, const char *argv[])
 
 	if (config.has("help"))
 	{
-		std::cerr << "Usage: mkdssp [options] input-file [output-file]" << std::endl
-				  << std::endl
-				  << config << std::endl;
+		std::cerr << config << std::endl;
 		exit(0);
 	}