From 79381bc54b9e0c85156460daa211fe5ac83da0a7 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Fri, 28 Sep 2012 15:03:17 +0200 Subject: [PATCH] Sync gengetopt cmake files with rtk --- cmake/FindGengetopt.cmake | 5 ++++- {cmake => utilities}/gengetopt/CMakeLists.txt | 0 {cmake => utilities}/gengetopt/Makefile.am | 0 {cmake => utilities}/gengetopt/acceptedvalues.cpp | 0 {cmake => utilities}/gengetopt/acceptedvalues.h | 0 {cmake => utilities}/gengetopt/argsdef.c | 0 {cmake => utilities}/gengetopt/argsdef.h | 0 {cmake => utilities}/gengetopt/cmdline.c | 0 {cmake => utilities}/gengetopt/cmdline.ggo | 0 {cmake => utilities}/gengetopt/cmdline.h | 0 {cmake => utilities}/gengetopt/errorcodes.h | 0 {cmake => utilities}/gengetopt/fileutils.cpp | 0 {cmake => utilities}/gengetopt/fileutils.h | 0 {cmake => utilities}/gengetopt/gengetopt.cc | 0 {cmake => utilities}/gengetopt/gengetopt.h | 0 {cmake => utilities}/gengetopt/getopt.c | 0 {cmake => utilities}/gengetopt/getopt.h | 0 {cmake => utilities}/gengetopt/getopt1.c | 0 {cmake => utilities}/gengetopt/ggo_options.h | 0 {cmake => utilities}/gengetopt/ggos.cpp | 0 {cmake => utilities}/gengetopt/ggos.h | 0 {cmake => utilities}/gengetopt/global_opts.h | 0 {cmake => utilities}/gengetopt/globals.cpp | 0 {cmake => utilities}/gengetopt/globals.h | 0 {cmake => utilities}/gengetopt/gm.cc | 0 {cmake => utilities}/gengetopt/gm.h | 0 {cmake => utilities}/gengetopt/gm_utils.cpp | 0 {cmake => utilities}/gengetopt/gm_utils.h | 0 {cmake => utilities}/gengetopt/groups.h | 0 {cmake => utilities}/gengetopt/my_map.h | 0 {cmake => utilities}/gengetopt/my_sstream.h | 0 {cmake => utilities}/gengetopt/my_string.h | 0 {cmake => utilities}/gengetopt/parser.cc | 0 {cmake => utilities}/gengetopt/parser.h | 0 {cmake => utilities}/gengetopt/parser.yy | 0 {cmake => utilities}/gengetopt/scanner.cc | 0 {cmake => utilities}/gengetopt/skels/Makefile.am | 0 {cmake => utilities}/gengetopt/skels/c_source.cc | 0 {cmake => utilities}/gengetopt/skels/c_source.h | 0 {cmake => utilities}/gengetopt/skels/check_modes.cc | 0 {cmake => utilities}/gengetopt/skels/check_modes.h | 0 {cmake => utilities}/gengetopt/skels/clear_arg.cc | 0 {cmake => utilities}/gengetopt/skels/clear_arg.h | 0 {cmake => utilities}/gengetopt/skels/clear_given.cc | 0 {cmake => utilities}/gengetopt/skels/clear_given.h | 0 {cmake => utilities}/gengetopt/skels/copyright.cc | 0 {cmake => utilities}/gengetopt/skels/copyright.h | 0 {cmake => utilities}/gengetopt/skels/custom_getopt_gen.cc | 0 {cmake => utilities}/gengetopt/skels/custom_getopt_gen.h | 0 {cmake => utilities}/gengetopt/skels/dependant_option.cc | 0 {cmake => utilities}/gengetopt/skels/dependant_option.h | 0 {cmake => utilities}/gengetopt/skels/enum_decl.cc | 0 {cmake => utilities}/gengetopt/skels/enum_decl.h | 0 {cmake => utilities}/gengetopt/skels/exit_failure.cc | 0 {cmake => utilities}/gengetopt/skels/exit_failure.h | 0 {cmake => utilities}/gengetopt/skels/file_save.cc | 0 {cmake => utilities}/gengetopt/skels/file_save.h | 0 {cmake => utilities}/gengetopt/skels/file_save_multiple.cc | 0 {cmake => utilities}/gengetopt/skels/file_save_multiple.h | 0 {cmake => utilities}/gengetopt/skels/free_list.cc | 0 {cmake => utilities}/gengetopt/skels/free_list.h | 0 {cmake => utilities}/gengetopt/skels/free_multiple.cc | 0 {cmake => utilities}/gengetopt/skels/free_multiple.h | 0 {cmake => utilities}/gengetopt/skels/free_string.cc | 0 {cmake => utilities}/gengetopt/skels/free_string.h | 0 {cmake => utilities}/gengetopt/skels/generic_option.cc | 0 {cmake => utilities}/gengetopt/skels/generic_option.h | 0 {cmake => utilities}/gengetopt/skels/given_field.cc | 0 {cmake => utilities}/gengetopt/skels/given_field.h | 0 {cmake => utilities}/gengetopt/skels/group_counter.cc | 0 {cmake => utilities}/gengetopt/skels/group_counter.h | 0 {cmake => utilities}/gengetopt/skels/group_option.cc | 0 {cmake => utilities}/gengetopt/skels/group_option.h | 0 {cmake => utilities}/gengetopt/skels/handle_help.cc | 0 {cmake => utilities}/gengetopt/skels/handle_help.h | 0 {cmake => utilities}/gengetopt/skels/handle_version.cc | 0 {cmake => utilities}/gengetopt/skels/handle_version.h | 0 {cmake => utilities}/gengetopt/skels/header.cc | 0 {cmake => utilities}/gengetopt/skels/header.h | 0 {cmake => utilities}/gengetopt/skels/init_args_info.cc | 0 {cmake => utilities}/gengetopt/skels/init_args_info.h | 0 {cmake => utilities}/gengetopt/skels/multiple_fill_array.cc | 0 {cmake => utilities}/gengetopt/skels/multiple_fill_array.h | 0 {cmake => utilities}/gengetopt/skels/multiple_opt_list.cc | 0 {cmake => utilities}/gengetopt/skels/multiple_opt_list.h | 0 {cmake => utilities}/gengetopt/skels/option_arg.cc | 0 {cmake => utilities}/gengetopt/skels/option_arg.h | 0 {cmake => utilities}/gengetopt/skels/print_help_string.cc | 0 {cmake => utilities}/gengetopt/skels/print_help_string.h | 0 {cmake => utilities}/gengetopt/skels/required_option.cc | 0 {cmake => utilities}/gengetopt/skels/required_option.h | 0 {cmake => utilities}/gengetopt/skels/reset_group.cc | 0 {cmake => utilities}/gengetopt/skels/reset_group.h | 0 {cmake => utilities}/gengetopt/skels/update_given.cc | 0 {cmake => utilities}/gengetopt/skels/update_given.h | 0 {cmake => utilities}/gengetopt/yyerror.cc | 0 {cmake => utilities}/gengetopt/yyerror.h | 0 {cmake => utilities}/gengetopt/yywrap.c | 0 98 files changed, 4 insertions(+), 1 deletion(-) rename {cmake => utilities}/gengetopt/CMakeLists.txt (100%) rename {cmake => utilities}/gengetopt/Makefile.am (100%) rename {cmake => utilities}/gengetopt/acceptedvalues.cpp (100%) rename {cmake => utilities}/gengetopt/acceptedvalues.h (100%) rename {cmake => utilities}/gengetopt/argsdef.c (100%) rename {cmake => utilities}/gengetopt/argsdef.h (100%) rename {cmake => utilities}/gengetopt/cmdline.c (100%) rename {cmake => utilities}/gengetopt/cmdline.ggo (100%) rename {cmake => utilities}/gengetopt/cmdline.h (100%) rename {cmake => utilities}/gengetopt/errorcodes.h (100%) rename {cmake => utilities}/gengetopt/fileutils.cpp (100%) rename {cmake => utilities}/gengetopt/fileutils.h (100%) rename {cmake => utilities}/gengetopt/gengetopt.cc (100%) rename {cmake => utilities}/gengetopt/gengetopt.h (100%) rename {cmake => utilities}/gengetopt/getopt.c (100%) rename {cmake => utilities}/gengetopt/getopt.h (100%) rename {cmake => utilities}/gengetopt/getopt1.c (100%) rename {cmake => utilities}/gengetopt/ggo_options.h (100%) rename {cmake => utilities}/gengetopt/ggos.cpp (100%) rename {cmake => utilities}/gengetopt/ggos.h (100%) rename {cmake => utilities}/gengetopt/global_opts.h (100%) rename {cmake => utilities}/gengetopt/globals.cpp (100%) rename {cmake => utilities}/gengetopt/globals.h (100%) rename {cmake => utilities}/gengetopt/gm.cc (100%) rename {cmake => utilities}/gengetopt/gm.h (100%) rename {cmake => utilities}/gengetopt/gm_utils.cpp (100%) rename {cmake => utilities}/gengetopt/gm_utils.h (100%) rename {cmake => utilities}/gengetopt/groups.h (100%) rename {cmake => utilities}/gengetopt/my_map.h (100%) rename {cmake => utilities}/gengetopt/my_sstream.h (100%) rename {cmake => utilities}/gengetopt/my_string.h (100%) rename {cmake => utilities}/gengetopt/parser.cc (100%) rename {cmake => utilities}/gengetopt/parser.h (100%) rename {cmake => utilities}/gengetopt/parser.yy (100%) rename {cmake => utilities}/gengetopt/scanner.cc (100%) rename {cmake => utilities}/gengetopt/skels/Makefile.am (100%) rename {cmake => utilities}/gengetopt/skels/c_source.cc (100%) rename {cmake => utilities}/gengetopt/skels/c_source.h (100%) rename {cmake => utilities}/gengetopt/skels/check_modes.cc (100%) rename {cmake => utilities}/gengetopt/skels/check_modes.h (100%) rename {cmake => utilities}/gengetopt/skels/clear_arg.cc (100%) rename {cmake => utilities}/gengetopt/skels/clear_arg.h (100%) rename {cmake => utilities}/gengetopt/skels/clear_given.cc (100%) rename {cmake => utilities}/gengetopt/skels/clear_given.h (100%) rename {cmake => utilities}/gengetopt/skels/copyright.cc (100%) rename {cmake => utilities}/gengetopt/skels/copyright.h (100%) rename {cmake => utilities}/gengetopt/skels/custom_getopt_gen.cc (100%) rename {cmake => utilities}/gengetopt/skels/custom_getopt_gen.h (100%) rename {cmake => utilities}/gengetopt/skels/dependant_option.cc (100%) rename {cmake => utilities}/gengetopt/skels/dependant_option.h (100%) rename {cmake => utilities}/gengetopt/skels/enum_decl.cc (100%) rename {cmake => utilities}/gengetopt/skels/enum_decl.h (100%) rename {cmake => utilities}/gengetopt/skels/exit_failure.cc (100%) rename {cmake => utilities}/gengetopt/skels/exit_failure.h (100%) rename {cmake => utilities}/gengetopt/skels/file_save.cc (100%) rename {cmake => utilities}/gengetopt/skels/file_save.h (100%) rename {cmake => utilities}/gengetopt/skels/file_save_multiple.cc (100%) rename {cmake => utilities}/gengetopt/skels/file_save_multiple.h (100%) rename {cmake => utilities}/gengetopt/skels/free_list.cc (100%) rename {cmake => utilities}/gengetopt/skels/free_list.h (100%) rename {cmake => utilities}/gengetopt/skels/free_multiple.cc (100%) rename {cmake => utilities}/gengetopt/skels/free_multiple.h (100%) rename {cmake => utilities}/gengetopt/skels/free_string.cc (100%) rename {cmake => utilities}/gengetopt/skels/free_string.h (100%) rename {cmake => utilities}/gengetopt/skels/generic_option.cc (100%) rename {cmake => utilities}/gengetopt/skels/generic_option.h (100%) rename {cmake => utilities}/gengetopt/skels/given_field.cc (100%) rename {cmake => utilities}/gengetopt/skels/given_field.h (100%) rename {cmake => utilities}/gengetopt/skels/group_counter.cc (100%) rename {cmake => utilities}/gengetopt/skels/group_counter.h (100%) rename {cmake => utilities}/gengetopt/skels/group_option.cc (100%) rename {cmake => utilities}/gengetopt/skels/group_option.h (100%) rename {cmake => utilities}/gengetopt/skels/handle_help.cc (100%) rename {cmake => utilities}/gengetopt/skels/handle_help.h (100%) rename {cmake => utilities}/gengetopt/skels/handle_version.cc (100%) rename {cmake => utilities}/gengetopt/skels/handle_version.h (100%) rename {cmake => utilities}/gengetopt/skels/header.cc (100%) rename {cmake => utilities}/gengetopt/skels/header.h (100%) rename {cmake => utilities}/gengetopt/skels/init_args_info.cc (100%) rename {cmake => utilities}/gengetopt/skels/init_args_info.h (100%) rename {cmake => utilities}/gengetopt/skels/multiple_fill_array.cc (100%) rename {cmake => utilities}/gengetopt/skels/multiple_fill_array.h (100%) rename {cmake => utilities}/gengetopt/skels/multiple_opt_list.cc (100%) rename {cmake => utilities}/gengetopt/skels/multiple_opt_list.h (100%) rename {cmake => utilities}/gengetopt/skels/option_arg.cc (100%) rename {cmake => utilities}/gengetopt/skels/option_arg.h (100%) rename {cmake => utilities}/gengetopt/skels/print_help_string.cc (100%) rename {cmake => utilities}/gengetopt/skels/print_help_string.h (100%) rename {cmake => utilities}/gengetopt/skels/required_option.cc (100%) rename {cmake => utilities}/gengetopt/skels/required_option.h (100%) rename {cmake => utilities}/gengetopt/skels/reset_group.cc (100%) rename {cmake => utilities}/gengetopt/skels/reset_group.h (100%) rename {cmake => utilities}/gengetopt/skels/update_given.cc (100%) rename {cmake => utilities}/gengetopt/skels/update_given.h (100%) rename {cmake => utilities}/gengetopt/yyerror.cc (100%) rename {cmake => utilities}/gengetopt/yyerror.h (100%) rename {cmake => utilities}/gengetopt/yywrap.c (100%) diff --git a/cmake/FindGengetopt.cmake b/cmake/FindGengetopt.cmake index 7766542..78098f9 100644 --- a/cmake/FindGengetopt.cmake +++ b/cmake/FindGengetopt.cmake @@ -3,7 +3,7 @@ FIND_PROGRAM(GENGETOPT gengetopt) IF (GENGETOPT STREQUAL "GENGETOPT-NOTFOUND") GET_FILENAME_COMPONENT(CLITK_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - ADD_SUBDIRECTORY(${CLITK_CMAKE_DIR}/gengetopt ${CMAKE_CURRENT_BINARY_DIR}/gengetopt) + ADD_SUBDIRECTORY(${CLITK_CMAKE_DIR}/../utilities/gengetopt ${CMAKE_CURRENT_BINARY_DIR}/gengetopt) ELSE(GENGETOPT STREQUAL "GENGETOPT-NOTFOUND") ADD_EXECUTABLE(gengetopt IMPORTED) SET_PROPERTY(TARGET gengetopt PROPERTY IMPORTED_LOCATION ${GENGETOPT}) @@ -32,4 +32,7 @@ MACRO (WRAP_GGO GGO_SRCS) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ENDFOREACH(GGO_FILE) SET_SOURCE_FILES_PROPERTIES(${${GGO_SRCS}} PROPERTIES GENERATED TRUE) + IF(CMAKE_COMPILER_IS_GNUCXX) + SET_SOURCE_FILES_PROPERTIES(${${GGO_SRCS}} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable") + ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDMACRO (WRAP_GGO) diff --git a/cmake/gengetopt/CMakeLists.txt b/utilities/gengetopt/CMakeLists.txt similarity index 100% rename from cmake/gengetopt/CMakeLists.txt rename to utilities/gengetopt/CMakeLists.txt diff --git a/cmake/gengetopt/Makefile.am b/utilities/gengetopt/Makefile.am similarity index 100% rename from cmake/gengetopt/Makefile.am rename to utilities/gengetopt/Makefile.am diff --git a/cmake/gengetopt/acceptedvalues.cpp b/utilities/gengetopt/acceptedvalues.cpp similarity index 100% rename from cmake/gengetopt/acceptedvalues.cpp rename to utilities/gengetopt/acceptedvalues.cpp diff --git a/cmake/gengetopt/acceptedvalues.h b/utilities/gengetopt/acceptedvalues.h similarity index 100% rename from cmake/gengetopt/acceptedvalues.h rename to utilities/gengetopt/acceptedvalues.h diff --git a/cmake/gengetopt/argsdef.c b/utilities/gengetopt/argsdef.c similarity index 100% rename from cmake/gengetopt/argsdef.c rename to utilities/gengetopt/argsdef.c diff --git a/cmake/gengetopt/argsdef.h b/utilities/gengetopt/argsdef.h similarity index 100% rename from cmake/gengetopt/argsdef.h rename to utilities/gengetopt/argsdef.h diff --git a/cmake/gengetopt/cmdline.c b/utilities/gengetopt/cmdline.c similarity index 100% rename from cmake/gengetopt/cmdline.c rename to utilities/gengetopt/cmdline.c diff --git a/cmake/gengetopt/cmdline.ggo b/utilities/gengetopt/cmdline.ggo similarity index 100% rename from cmake/gengetopt/cmdline.ggo rename to utilities/gengetopt/cmdline.ggo diff --git a/cmake/gengetopt/cmdline.h b/utilities/gengetopt/cmdline.h similarity index 100% rename from cmake/gengetopt/cmdline.h rename to utilities/gengetopt/cmdline.h diff --git a/cmake/gengetopt/errorcodes.h b/utilities/gengetopt/errorcodes.h similarity index 100% rename from cmake/gengetopt/errorcodes.h rename to utilities/gengetopt/errorcodes.h diff --git a/cmake/gengetopt/fileutils.cpp b/utilities/gengetopt/fileutils.cpp similarity index 100% rename from cmake/gengetopt/fileutils.cpp rename to utilities/gengetopt/fileutils.cpp diff --git a/cmake/gengetopt/fileutils.h b/utilities/gengetopt/fileutils.h similarity index 100% rename from cmake/gengetopt/fileutils.h rename to utilities/gengetopt/fileutils.h diff --git a/cmake/gengetopt/gengetopt.cc b/utilities/gengetopt/gengetopt.cc similarity index 100% rename from cmake/gengetopt/gengetopt.cc rename to utilities/gengetopt/gengetopt.cc diff --git a/cmake/gengetopt/gengetopt.h b/utilities/gengetopt/gengetopt.h similarity index 100% rename from cmake/gengetopt/gengetopt.h rename to utilities/gengetopt/gengetopt.h diff --git a/cmake/gengetopt/getopt.c b/utilities/gengetopt/getopt.c similarity index 100% rename from cmake/gengetopt/getopt.c rename to utilities/gengetopt/getopt.c diff --git a/cmake/gengetopt/getopt.h b/utilities/gengetopt/getopt.h similarity index 100% rename from cmake/gengetopt/getopt.h rename to utilities/gengetopt/getopt.h diff --git a/cmake/gengetopt/getopt1.c b/utilities/gengetopt/getopt1.c similarity index 100% rename from cmake/gengetopt/getopt1.c rename to utilities/gengetopt/getopt1.c diff --git a/cmake/gengetopt/ggo_options.h b/utilities/gengetopt/ggo_options.h similarity index 100% rename from cmake/gengetopt/ggo_options.h rename to utilities/gengetopt/ggo_options.h diff --git a/cmake/gengetopt/ggos.cpp b/utilities/gengetopt/ggos.cpp similarity index 100% rename from cmake/gengetopt/ggos.cpp rename to utilities/gengetopt/ggos.cpp diff --git a/cmake/gengetopt/ggos.h b/utilities/gengetopt/ggos.h similarity index 100% rename from cmake/gengetopt/ggos.h rename to utilities/gengetopt/ggos.h diff --git a/cmake/gengetopt/global_opts.h b/utilities/gengetopt/global_opts.h similarity index 100% rename from cmake/gengetopt/global_opts.h rename to utilities/gengetopt/global_opts.h diff --git a/cmake/gengetopt/globals.cpp b/utilities/gengetopt/globals.cpp similarity index 100% rename from cmake/gengetopt/globals.cpp rename to utilities/gengetopt/globals.cpp diff --git a/cmake/gengetopt/globals.h b/utilities/gengetopt/globals.h similarity index 100% rename from cmake/gengetopt/globals.h rename to utilities/gengetopt/globals.h diff --git a/cmake/gengetopt/gm.cc b/utilities/gengetopt/gm.cc similarity index 100% rename from cmake/gengetopt/gm.cc rename to utilities/gengetopt/gm.cc diff --git a/cmake/gengetopt/gm.h b/utilities/gengetopt/gm.h similarity index 100% rename from cmake/gengetopt/gm.h rename to utilities/gengetopt/gm.h diff --git a/cmake/gengetopt/gm_utils.cpp b/utilities/gengetopt/gm_utils.cpp similarity index 100% rename from cmake/gengetopt/gm_utils.cpp rename to utilities/gengetopt/gm_utils.cpp diff --git a/cmake/gengetopt/gm_utils.h b/utilities/gengetopt/gm_utils.h similarity index 100% rename from cmake/gengetopt/gm_utils.h rename to utilities/gengetopt/gm_utils.h diff --git a/cmake/gengetopt/groups.h b/utilities/gengetopt/groups.h similarity index 100% rename from cmake/gengetopt/groups.h rename to utilities/gengetopt/groups.h diff --git a/cmake/gengetopt/my_map.h b/utilities/gengetopt/my_map.h similarity index 100% rename from cmake/gengetopt/my_map.h rename to utilities/gengetopt/my_map.h diff --git a/cmake/gengetopt/my_sstream.h b/utilities/gengetopt/my_sstream.h similarity index 100% rename from cmake/gengetopt/my_sstream.h rename to utilities/gengetopt/my_sstream.h diff --git a/cmake/gengetopt/my_string.h b/utilities/gengetopt/my_string.h similarity index 100% rename from cmake/gengetopt/my_string.h rename to utilities/gengetopt/my_string.h diff --git a/cmake/gengetopt/parser.cc b/utilities/gengetopt/parser.cc similarity index 100% rename from cmake/gengetopt/parser.cc rename to utilities/gengetopt/parser.cc diff --git a/cmake/gengetopt/parser.h b/utilities/gengetopt/parser.h similarity index 100% rename from cmake/gengetopt/parser.h rename to utilities/gengetopt/parser.h diff --git a/cmake/gengetopt/parser.yy b/utilities/gengetopt/parser.yy similarity index 100% rename from cmake/gengetopt/parser.yy rename to utilities/gengetopt/parser.yy diff --git a/cmake/gengetopt/scanner.cc b/utilities/gengetopt/scanner.cc similarity index 100% rename from cmake/gengetopt/scanner.cc rename to utilities/gengetopt/scanner.cc diff --git a/cmake/gengetopt/skels/Makefile.am b/utilities/gengetopt/skels/Makefile.am similarity index 100% rename from cmake/gengetopt/skels/Makefile.am rename to utilities/gengetopt/skels/Makefile.am diff --git a/cmake/gengetopt/skels/c_source.cc b/utilities/gengetopt/skels/c_source.cc similarity index 100% rename from cmake/gengetopt/skels/c_source.cc rename to utilities/gengetopt/skels/c_source.cc diff --git a/cmake/gengetopt/skels/c_source.h b/utilities/gengetopt/skels/c_source.h similarity index 100% rename from cmake/gengetopt/skels/c_source.h rename to utilities/gengetopt/skels/c_source.h diff --git a/cmake/gengetopt/skels/check_modes.cc b/utilities/gengetopt/skels/check_modes.cc similarity index 100% rename from cmake/gengetopt/skels/check_modes.cc rename to utilities/gengetopt/skels/check_modes.cc diff --git a/cmake/gengetopt/skels/check_modes.h b/utilities/gengetopt/skels/check_modes.h similarity index 100% rename from cmake/gengetopt/skels/check_modes.h rename to utilities/gengetopt/skels/check_modes.h diff --git a/cmake/gengetopt/skels/clear_arg.cc b/utilities/gengetopt/skels/clear_arg.cc similarity index 100% rename from cmake/gengetopt/skels/clear_arg.cc rename to utilities/gengetopt/skels/clear_arg.cc diff --git a/cmake/gengetopt/skels/clear_arg.h b/utilities/gengetopt/skels/clear_arg.h similarity index 100% rename from cmake/gengetopt/skels/clear_arg.h rename to utilities/gengetopt/skels/clear_arg.h diff --git a/cmake/gengetopt/skels/clear_given.cc b/utilities/gengetopt/skels/clear_given.cc similarity index 100% rename from cmake/gengetopt/skels/clear_given.cc rename to utilities/gengetopt/skels/clear_given.cc diff --git a/cmake/gengetopt/skels/clear_given.h b/utilities/gengetopt/skels/clear_given.h similarity index 100% rename from cmake/gengetopt/skels/clear_given.h rename to utilities/gengetopt/skels/clear_given.h diff --git a/cmake/gengetopt/skels/copyright.cc b/utilities/gengetopt/skels/copyright.cc similarity index 100% rename from cmake/gengetopt/skels/copyright.cc rename to utilities/gengetopt/skels/copyright.cc diff --git a/cmake/gengetopt/skels/copyright.h b/utilities/gengetopt/skels/copyright.h similarity index 100% rename from cmake/gengetopt/skels/copyright.h rename to utilities/gengetopt/skels/copyright.h diff --git a/cmake/gengetopt/skels/custom_getopt_gen.cc b/utilities/gengetopt/skels/custom_getopt_gen.cc similarity index 100% rename from cmake/gengetopt/skels/custom_getopt_gen.cc rename to utilities/gengetopt/skels/custom_getopt_gen.cc diff --git a/cmake/gengetopt/skels/custom_getopt_gen.h b/utilities/gengetopt/skels/custom_getopt_gen.h similarity index 100% rename from cmake/gengetopt/skels/custom_getopt_gen.h rename to utilities/gengetopt/skels/custom_getopt_gen.h diff --git a/cmake/gengetopt/skels/dependant_option.cc b/utilities/gengetopt/skels/dependant_option.cc similarity index 100% rename from cmake/gengetopt/skels/dependant_option.cc rename to utilities/gengetopt/skels/dependant_option.cc diff --git a/cmake/gengetopt/skels/dependant_option.h b/utilities/gengetopt/skels/dependant_option.h similarity index 100% rename from cmake/gengetopt/skels/dependant_option.h rename to utilities/gengetopt/skels/dependant_option.h diff --git a/cmake/gengetopt/skels/enum_decl.cc b/utilities/gengetopt/skels/enum_decl.cc similarity index 100% rename from cmake/gengetopt/skels/enum_decl.cc rename to utilities/gengetopt/skels/enum_decl.cc diff --git a/cmake/gengetopt/skels/enum_decl.h b/utilities/gengetopt/skels/enum_decl.h similarity index 100% rename from cmake/gengetopt/skels/enum_decl.h rename to utilities/gengetopt/skels/enum_decl.h diff --git a/cmake/gengetopt/skels/exit_failure.cc b/utilities/gengetopt/skels/exit_failure.cc similarity index 100% rename from cmake/gengetopt/skels/exit_failure.cc rename to utilities/gengetopt/skels/exit_failure.cc diff --git a/cmake/gengetopt/skels/exit_failure.h b/utilities/gengetopt/skels/exit_failure.h similarity index 100% rename from cmake/gengetopt/skels/exit_failure.h rename to utilities/gengetopt/skels/exit_failure.h diff --git a/cmake/gengetopt/skels/file_save.cc b/utilities/gengetopt/skels/file_save.cc similarity index 100% rename from cmake/gengetopt/skels/file_save.cc rename to utilities/gengetopt/skels/file_save.cc diff --git a/cmake/gengetopt/skels/file_save.h b/utilities/gengetopt/skels/file_save.h similarity index 100% rename from cmake/gengetopt/skels/file_save.h rename to utilities/gengetopt/skels/file_save.h diff --git a/cmake/gengetopt/skels/file_save_multiple.cc b/utilities/gengetopt/skels/file_save_multiple.cc similarity index 100% rename from cmake/gengetopt/skels/file_save_multiple.cc rename to utilities/gengetopt/skels/file_save_multiple.cc diff --git a/cmake/gengetopt/skels/file_save_multiple.h b/utilities/gengetopt/skels/file_save_multiple.h similarity index 100% rename from cmake/gengetopt/skels/file_save_multiple.h rename to utilities/gengetopt/skels/file_save_multiple.h diff --git a/cmake/gengetopt/skels/free_list.cc b/utilities/gengetopt/skels/free_list.cc similarity index 100% rename from cmake/gengetopt/skels/free_list.cc rename to utilities/gengetopt/skels/free_list.cc diff --git a/cmake/gengetopt/skels/free_list.h b/utilities/gengetopt/skels/free_list.h similarity index 100% rename from cmake/gengetopt/skels/free_list.h rename to utilities/gengetopt/skels/free_list.h diff --git a/cmake/gengetopt/skels/free_multiple.cc b/utilities/gengetopt/skels/free_multiple.cc similarity index 100% rename from cmake/gengetopt/skels/free_multiple.cc rename to utilities/gengetopt/skels/free_multiple.cc diff --git a/cmake/gengetopt/skels/free_multiple.h b/utilities/gengetopt/skels/free_multiple.h similarity index 100% rename from cmake/gengetopt/skels/free_multiple.h rename to utilities/gengetopt/skels/free_multiple.h diff --git a/cmake/gengetopt/skels/free_string.cc b/utilities/gengetopt/skels/free_string.cc similarity index 100% rename from cmake/gengetopt/skels/free_string.cc rename to utilities/gengetopt/skels/free_string.cc diff --git a/cmake/gengetopt/skels/free_string.h b/utilities/gengetopt/skels/free_string.h similarity index 100% rename from cmake/gengetopt/skels/free_string.h rename to utilities/gengetopt/skels/free_string.h diff --git a/cmake/gengetopt/skels/generic_option.cc b/utilities/gengetopt/skels/generic_option.cc similarity index 100% rename from cmake/gengetopt/skels/generic_option.cc rename to utilities/gengetopt/skels/generic_option.cc diff --git a/cmake/gengetopt/skels/generic_option.h b/utilities/gengetopt/skels/generic_option.h similarity index 100% rename from cmake/gengetopt/skels/generic_option.h rename to utilities/gengetopt/skels/generic_option.h diff --git a/cmake/gengetopt/skels/given_field.cc b/utilities/gengetopt/skels/given_field.cc similarity index 100% rename from cmake/gengetopt/skels/given_field.cc rename to utilities/gengetopt/skels/given_field.cc diff --git a/cmake/gengetopt/skels/given_field.h b/utilities/gengetopt/skels/given_field.h similarity index 100% rename from cmake/gengetopt/skels/given_field.h rename to utilities/gengetopt/skels/given_field.h diff --git a/cmake/gengetopt/skels/group_counter.cc b/utilities/gengetopt/skels/group_counter.cc similarity index 100% rename from cmake/gengetopt/skels/group_counter.cc rename to utilities/gengetopt/skels/group_counter.cc diff --git a/cmake/gengetopt/skels/group_counter.h b/utilities/gengetopt/skels/group_counter.h similarity index 100% rename from cmake/gengetopt/skels/group_counter.h rename to utilities/gengetopt/skels/group_counter.h diff --git a/cmake/gengetopt/skels/group_option.cc b/utilities/gengetopt/skels/group_option.cc similarity index 100% rename from cmake/gengetopt/skels/group_option.cc rename to utilities/gengetopt/skels/group_option.cc diff --git a/cmake/gengetopt/skels/group_option.h b/utilities/gengetopt/skels/group_option.h similarity index 100% rename from cmake/gengetopt/skels/group_option.h rename to utilities/gengetopt/skels/group_option.h diff --git a/cmake/gengetopt/skels/handle_help.cc b/utilities/gengetopt/skels/handle_help.cc similarity index 100% rename from cmake/gengetopt/skels/handle_help.cc rename to utilities/gengetopt/skels/handle_help.cc diff --git a/cmake/gengetopt/skels/handle_help.h b/utilities/gengetopt/skels/handle_help.h similarity index 100% rename from cmake/gengetopt/skels/handle_help.h rename to utilities/gengetopt/skels/handle_help.h diff --git a/cmake/gengetopt/skels/handle_version.cc b/utilities/gengetopt/skels/handle_version.cc similarity index 100% rename from cmake/gengetopt/skels/handle_version.cc rename to utilities/gengetopt/skels/handle_version.cc diff --git a/cmake/gengetopt/skels/handle_version.h b/utilities/gengetopt/skels/handle_version.h similarity index 100% rename from cmake/gengetopt/skels/handle_version.h rename to utilities/gengetopt/skels/handle_version.h diff --git a/cmake/gengetopt/skels/header.cc b/utilities/gengetopt/skels/header.cc similarity index 100% rename from cmake/gengetopt/skels/header.cc rename to utilities/gengetopt/skels/header.cc diff --git a/cmake/gengetopt/skels/header.h b/utilities/gengetopt/skels/header.h similarity index 100% rename from cmake/gengetopt/skels/header.h rename to utilities/gengetopt/skels/header.h diff --git a/cmake/gengetopt/skels/init_args_info.cc b/utilities/gengetopt/skels/init_args_info.cc similarity index 100% rename from cmake/gengetopt/skels/init_args_info.cc rename to utilities/gengetopt/skels/init_args_info.cc diff --git a/cmake/gengetopt/skels/init_args_info.h b/utilities/gengetopt/skels/init_args_info.h similarity index 100% rename from cmake/gengetopt/skels/init_args_info.h rename to utilities/gengetopt/skels/init_args_info.h diff --git a/cmake/gengetopt/skels/multiple_fill_array.cc b/utilities/gengetopt/skels/multiple_fill_array.cc similarity index 100% rename from cmake/gengetopt/skels/multiple_fill_array.cc rename to utilities/gengetopt/skels/multiple_fill_array.cc diff --git a/cmake/gengetopt/skels/multiple_fill_array.h b/utilities/gengetopt/skels/multiple_fill_array.h similarity index 100% rename from cmake/gengetopt/skels/multiple_fill_array.h rename to utilities/gengetopt/skels/multiple_fill_array.h diff --git a/cmake/gengetopt/skels/multiple_opt_list.cc b/utilities/gengetopt/skels/multiple_opt_list.cc similarity index 100% rename from cmake/gengetopt/skels/multiple_opt_list.cc rename to utilities/gengetopt/skels/multiple_opt_list.cc diff --git a/cmake/gengetopt/skels/multiple_opt_list.h b/utilities/gengetopt/skels/multiple_opt_list.h similarity index 100% rename from cmake/gengetopt/skels/multiple_opt_list.h rename to utilities/gengetopt/skels/multiple_opt_list.h diff --git a/cmake/gengetopt/skels/option_arg.cc b/utilities/gengetopt/skels/option_arg.cc similarity index 100% rename from cmake/gengetopt/skels/option_arg.cc rename to utilities/gengetopt/skels/option_arg.cc diff --git a/cmake/gengetopt/skels/option_arg.h b/utilities/gengetopt/skels/option_arg.h similarity index 100% rename from cmake/gengetopt/skels/option_arg.h rename to utilities/gengetopt/skels/option_arg.h diff --git a/cmake/gengetopt/skels/print_help_string.cc b/utilities/gengetopt/skels/print_help_string.cc similarity index 100% rename from cmake/gengetopt/skels/print_help_string.cc rename to utilities/gengetopt/skels/print_help_string.cc diff --git a/cmake/gengetopt/skels/print_help_string.h b/utilities/gengetopt/skels/print_help_string.h similarity index 100% rename from cmake/gengetopt/skels/print_help_string.h rename to utilities/gengetopt/skels/print_help_string.h diff --git a/cmake/gengetopt/skels/required_option.cc b/utilities/gengetopt/skels/required_option.cc similarity index 100% rename from cmake/gengetopt/skels/required_option.cc rename to utilities/gengetopt/skels/required_option.cc diff --git a/cmake/gengetopt/skels/required_option.h b/utilities/gengetopt/skels/required_option.h similarity index 100% rename from cmake/gengetopt/skels/required_option.h rename to utilities/gengetopt/skels/required_option.h diff --git a/cmake/gengetopt/skels/reset_group.cc b/utilities/gengetopt/skels/reset_group.cc similarity index 100% rename from cmake/gengetopt/skels/reset_group.cc rename to utilities/gengetopt/skels/reset_group.cc diff --git a/cmake/gengetopt/skels/reset_group.h b/utilities/gengetopt/skels/reset_group.h similarity index 100% rename from cmake/gengetopt/skels/reset_group.h rename to utilities/gengetopt/skels/reset_group.h diff --git a/cmake/gengetopt/skels/update_given.cc b/utilities/gengetopt/skels/update_given.cc similarity index 100% rename from cmake/gengetopt/skels/update_given.cc rename to utilities/gengetopt/skels/update_given.cc diff --git a/cmake/gengetopt/skels/update_given.h b/utilities/gengetopt/skels/update_given.h similarity index 100% rename from cmake/gengetopt/skels/update_given.h rename to utilities/gengetopt/skels/update_given.h diff --git a/cmake/gengetopt/yyerror.cc b/utilities/gengetopt/yyerror.cc similarity index 100% rename from cmake/gengetopt/yyerror.cc rename to utilities/gengetopt/yyerror.cc diff --git a/cmake/gengetopt/yyerror.h b/utilities/gengetopt/yyerror.h similarity index 100% rename from cmake/gengetopt/yyerror.h rename to utilities/gengetopt/yyerror.h diff --git a/cmake/gengetopt/yywrap.c b/utilities/gengetopt/yywrap.c similarity index 100% rename from cmake/gengetopt/yywrap.c rename to utilities/gengetopt/yywrap.c -- 2.45.1