Skip to content

Commit

Permalink
Docopt (#58)
Browse files Browse the repository at this point in the history
* switching docopt.cpp to upstream version 0.6.2
 - contains Boost fix for borken C++11 std::regex on GCC 4.8.x

* success exit code for `--help`
  • Loading branch information
armintoepfer authored Nov 24, 2017
1 parent a8fa81c commit b658670
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 2,375 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
path = external/googletest
url = https://github.com/google/googletest.git
branch = master
[submodule "external/docopt.cpp"]
path = external/docopt.cpp
url = https://github.com/docopt/docopt.cpp.git
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ include(hc-compilerflags)
include(hc-dependencies)

add_subdirectory(${HC_EXTERNALDIR}/BamTools external/bamtools)
add_subdirectory(${HC_EXTERNALDIR}/docopt.cpp external/docopt.cpp)
add_subdirectory(src)
add_subdirectory(test)
1 change: 1 addition & 0 deletions external/docopt.cpp
Submodule docopt.cpp added at 181102
14 changes: 11 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,29 @@ target_include_directories(hc PUBLIC
${HC_SRCDIR}
${Boost_INCLUDE_DIR}
${HC_EXTERNALDIR}/BamTools/src
${HC_EXTERNALDIR}/docopt.cpp
${PROJECT_BINARY_DIR}
)
target_link_libraries(hc
${Boost_LIBRARIES}
)
if (HC_STATIC)
target_link_libraries(hc BamTools-static)
target_link_libraries(hc BamTools-static docopt_s)
else()
target_link_libraries(hc BamTools)
target_link_libraries(hc BamTools docopt_s)
endif()

set_target_properties(hc PROPERTIES COMPILE_FLAGS ${HC_COMPILE_FLAGS})
if (HC_LINK_FLAGS)
set_target_properties(hc PROPERTIES LINK_FLAGS ${HC_LINK_FLAGS})
endif()

# Version
configure_file (
"${HC_SRCDIR}/version.h.in"
"${PROJECT_BINARY_DIR}/version.h"
)

# Haploclique executable
add_executable (haploclique haploclique.cpp)
set_target_properties(haploclique PROPERTIES COMPILE_FLAGS ${HC_COMPILE_FLAGS})
Expand All @@ -55,4 +63,4 @@ set_target_properties(haploclique PROPERTIES

target_link_libraries(haploclique hc)

install(TARGETS haploclique RUNTIME DESTINATION bin)
install(TARGETS haploclique RUNTIME DESTINATION bin)
18 changes: 0 additions & 18 deletions src/docopt/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions src/docopt/LICENSE-Boost-1.0

This file was deleted.

23 changes: 0 additions & 23 deletions src/docopt/LICENSE-MIT

This file was deleted.

Loading

0 comments on commit b658670

Please sign in to comment.