Skip to content

Commit cdff3dd

Browse files
authored
Merge pull request #3107 from smehringer/remove_sharg
[INFRA] Remove sharg submodule again.
2 parents 7fe6a89 + e4b3c52 commit cdff3dd

File tree

3 files changed

+1
-48
lines changed

3 files changed

+1
-48
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
[submodule "cereal"]
55
path = submodules/cereal
66
url = https://github.com/USCiLab/cereal
7-
[submodule "submodules/sharg-parser"]
8-
path = submodules/sharg-parser
9-
url = https://github.com/seqan/sharg-parser.git

build_system/seqan3-config.cmake

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@
2424
#
2525
# SeqAn has the following optional dependencies:
2626
#
27-
# Sharg -- Argument Parsing
2827
# ZLIB -- zlib compression library
2928
# BZip2 -- libbz2 compression library
3029
# Cereal -- Serialisation library
3130
#
32-
# If you don't wish for these to be detected (and used), you may define SEQAN3_NO_SHARG, SEQAN3_NO_ZLIB,
31+
# If you don't wish for these to be detected (and used), you may define SEQAN3_NO_ZLIB,
3332
# SEQAN3_NO_BZIP2, and SEQAN3_NO_CEREAL respectively.
3433
#
3534
# If you wish to require the presence of ZLIB or BZip2, just check for the module before
3635
# finding SeqAn3, e.g. "find_package (ZLIB REQUIRED)" and "find_package (BZip2 REQUIRED)".
37-
# If you wish to require the presence of SHARG, you may define SEQAN3_SHARG.
3836
# If you wish to require the presence of CEREAL, you may define SEQAN3_CEREAL.
3937
#
4038
# Once the search has been performed, the following variables will be set.
@@ -166,25 +164,6 @@ set (CMAKE_REQUIRED_FLAGS ${CMAKE_CXX_FLAGS})
166164
# Force-deactivate optional dependencies
167165
# ----------------------------------------------------------------------------
168166

169-
# Sharg is auto-detected by default, i.e. used if found, not used if not found.
170-
# You can optionally set a hard requirement so a build fails without Sharg,
171-
# or you can force-disable Sharg even if present on the system.
172-
option (SEQAN3_SHARG "Require Sharg and fail if not present." OFF)
173-
option (SEQAN3_NO_SHARG "Don't use Sharg, even if present." OFF)
174-
175-
if (SEQAN3_SHARG AND SEQAN3_NO_SHARG)
176-
# this is always a user error, therefore we always error-out, even if SeqAn is not required
177-
message (FATAL_ERROR "You may not specify SEQAN3_SHARG and SEQAN3_NO_SHARG at the same time.\n\
178-
You can specify neither (use auto-detection), or specify either to force on/off.")
179-
return ()
180-
endif ()
181-
182-
if (SEQAN3_SHARG)
183-
set (SEQAN3_DEFINITIONS ${SEQAN3_DEFINITIONS} "-DSEQAN3_WITH_SHARG=1")
184-
elseif (SEQAN3_NO_SHARG)
185-
set (SEQAN3_DEFINITIONS ${SEQAN3_DEFINITIONS} "-DSEQAN3_WITH_SHARG=0")
186-
endif ()
187-
188167
# Cereal is auto-detected by default, i.e. used if found, not used if not found.
189168
# You can optionally set a hard requirement so a build fails without cereal,
190169
# or you can force-disable cereal even if present on the system.
@@ -300,28 +279,6 @@ else ()
300279
"The SDSL library is required, but wasn't found. Get it from https://github.com/xxsds/sdsl-lite")
301280
endif ()
302281

303-
# ----------------------------------------------------------------------------
304-
# Sharg dependency is optional, but may set as required
305-
# ----------------------------------------------------------------------------
306-
307-
if (NOT SEQAN3_NO_SHARG)
308-
check_include_file_cxx (sharg/version.hpp _SEQAN3_HAVE_SHARG)
309-
310-
if (_SEQAN3_HAVE_SHARG)
311-
if (SEQAN3_SHARG)
312-
seqan3_config_print ("Required dependency: Sharg found.")
313-
else ()
314-
seqan3_config_print ("Optional dependency: Sharg found.")
315-
endif ()
316-
else ()
317-
if (SEQAN3_SHARG)
318-
seqan3_config_error ("The (optional) Sharg library was marked as required, but wasn't found.")
319-
else ()
320-
seqan3_config_print ("Optional dependency: Sharg not found.")
321-
endif ()
322-
endif ()
323-
endif ()
324-
325282
# ----------------------------------------------------------------------------
326283
# Cereal dependency is optional, but may set as required
327284
# ----------------------------------------------------------------------------

submodules/sharg-parser

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)