Commit e6aca64d6f3ae052832bba935100c37461829e86
Committed by
GitHub
GitHub
1 parent
73aa158d
Upgrade googletest, drop GCC 4.7 (#160)
Showing
5 changed files
with
14 additions
and
54 deletions
.travis.yml
| ... | ... | @@ -70,17 +70,17 @@ matrix: |
| 70 | 70 | - .ci/make_and_test.sh 14 -DCLI11_EXAMPLE_JSON=ON |
| 71 | 71 | - .ci/make_and_test.sh 17 -DCLI11_EXAMPLE_JSON=ON |
| 72 | 72 | |
| 73 | - # GCC 4.7 and Conan | |
| 73 | + # GCC 4.8 and Conan | |
| 74 | 74 | - compiler: gcc |
| 75 | 75 | env: |
| 76 | - - GCC_VER=4.7 | |
| 76 | + - GCC_VER=4.8 | |
| 77 | 77 | addons: |
| 78 | 78 | apt: |
| 79 | 79 | packages: |
| 80 | - - g++-4.7 | |
| 80 | + - g++-4.8 | |
| 81 | 81 | install: |
| 82 | - - export CC=gcc-4.7 | |
| 83 | - - export CXX=g++-4.7 | |
| 82 | + - export CC=gcc-4.8 | |
| 83 | + - export CXX=g++-4.8 | |
| 84 | 84 | - python -m pip install --user conan |
| 85 | 85 | - conan user |
| 86 | 86 | script: |
| ... | ... | @@ -95,19 +95,6 @@ matrix: |
| 95 | 95 | conan upload "*" -c -r origin --all |
| 96 | 96 | fi |
| 97 | 97 | |
| 98 | - # GCC 4.8 | |
| 99 | - - compiler: gcc | |
| 100 | - env: | |
| 101 | - - GCC_VER=4.8 | |
| 102 | - addons: | |
| 103 | - apt: | |
| 104 | - packages: | |
| 105 | - - g++-4.8 | |
| 106 | - install: | |
| 107 | - - export CC=gcc-4.8 | |
| 108 | - - export CXX=g++-4.8 | |
| 109 | - script: | |
| 110 | - - .ci/make_and_test.sh 11 | |
| 111 | 98 | |
| 112 | 99 | install: skip |
| 113 | 100 | ... | ... |
CHANGELOG.md
| 1 | +## Version 1.9: IN PROGRESS | |
| 2 | + | |
| 3 | +* GCC 4.7 is no longer supported, due mostly to GoogleTest. GCC 4.8+ is now required. | |
| 4 | + | |
| 1 | 5 | ## Version 1.8: Transformers, default strings, and flags |
| 2 | 6 | |
| 3 | 7 | Set handling has been completely replaced by a new backend that works as a Validator or Transformer. This provides a single interface instead of the 16 different functions in App. It also allows ordered collections to be used, custom functions for filtering, and better help and error messages. You can also use a collection of pairs (like `std::map`) to transform the match into an output. Also new are inverted flags, which can cancel or reduce the count of flags, and can also support general flag types. A new `add_option_fn` lets you more easily program CLI11 options with the types you choose. Vector options now support a custom separator. Apps can now be composed with unnamed subcommand support. The final bool "defaults" flag when creating options has been replaced by `->capture_default_str()` (ending an old limitation in construction made this possible); the old method is still available but may be removed in future versions. | ... | ... |
azure-pipelines.yml
cmake/AddGoogletest.cmake
| 1 | 1 | # |
| 2 | 2 | # |
| 3 | -# Downloads GTest and provides a helper macro to add tests. Add make check, as well, which | |
| 3 | +# Includes GTest and provides a helper macro to add tests. Add make check, as well, which | |
| 4 | 4 | # gives output on failed tests without having to set an environment variable. |
| 5 | 5 | # |
| 6 | 6 | # |
| 7 | 7 | set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) |
| 8 | 8 | set(BUILD_SHARED_LIBS OFF) |
| 9 | -# older version of google tests doesn't support MSYS so needs this flag to compile | |
| 10 | -if (MSYS) | |
| 11 | - set(gtest_disable_pthreads ON CACHE BOOL "" FORCE) | |
| 12 | -endif() | |
| 13 | -set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "") | |
| 9 | + | |
| 14 | 10 | add_subdirectory("${CLI11_SOURCE_DIR}/extern/googletest" "${CLI11_BINARY_DIR}/extern/googletest" EXCLUDE_FROM_ALL) |
| 15 | 11 | |
| 16 | 12 | |
| ... | ... | @@ -45,32 +41,5 @@ macro(add_gtest TESTNAME) |
| 45 | 41 | |
| 46 | 42 | endmacro() |
| 47 | 43 | |
| 48 | -mark_as_advanced( | |
| 49 | -gmock_build_tests | |
| 50 | -gtest_build_samples | |
| 51 | -gtest_build_tests | |
| 52 | -gtest_disable_pthreads | |
| 53 | -gtest_force_shared_crt | |
| 54 | -gtest_hide_internal_symbols | |
| 55 | -BUILD_GMOCK | |
| 56 | -BUILD_GTEST | |
| 57 | -) | |
| 58 | - | |
| 59 | 44 | set_target_properties(gtest gtest_main gmock gmock_main |
| 60 | 45 | PROPERTIES FOLDER "Extern") |
| 61 | - | |
| 62 | -foreach(TGT IN ITEMS gtest gtest_main gmock gmock_main) | |
| 63 | - get_property(DIR_LIST TARGET ${TGT} PROPERTY INTERFACE_INCLUDE_DIRECTORIES) | |
| 64 | - foreach(ITEM IN LISTS DIR_LIST) | |
| 65 | - set_property(TARGET ${TGT} APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${ITEM}") | |
| 66 | - endforeach() | |
| 67 | -endforeach() | |
| 68 | - | |
| 69 | -if(MSVC) | |
| 70 | - if (MSVC_VERSION GREATER_EQUAL 1900) | |
| 71 | - target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) | |
| 72 | - target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) | |
| 73 | - target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) | |
| 74 | - target_compile_definitions(gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) | |
| 75 | - endif() | |
| 76 | -endif() | ... | ... |