CMake build fixes (#25)

* Bump CMake to version 3.3 for IWYU support
* Have Travis download recent CMake

Author: isaachier

.travis.yml

@@ -27,9 +27,14 @@ branches:
   only:
   - master
 before_install:
-- eval "${MATRIX_EVAL}"
+  - eval "${MATRIX_EVAL}"
+  - mkdir cmake-download &&
+    cd cmake-download &&
+    curl -O https://cmake.org/files/v3.10/cmake-3.10.0-rc5-Linux-x86_64.sh &&
+    bash cmake-3.10.0-rc5-Linux-x86_64.sh --skip-license &&
+    cd ..
 script:
-- ./scripts/build.sh
+  - ./scripts/build.sh
 after_success:
 - for f in $(find build -name '*.gcno'); do gcov-6 $f; done
 - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage
@@ -45,4 +50,5 @@ after_script: |
 env:
   global:
   - LANG="en_US.UTF-8"
+  - PATH="$TRAVIS_BUILD_DIR/cmake-download/bin:$PATH"
   - secure: 1Pz1mI4PZdzFf2M33snYoaYu/gWxRGK22rw5h9DYtAMFyrqcTKJOI0WnXsIHxjZ5obqVLL/MaNTnO6PbO+sKGEueqNibZhYfjUbZtAV94/uXNkc6Qn6lNALJykqAueGXIkf04CLGpQaJoS8OebFdZODZMJzad58BpckJlF9O/v2OXNx244/bl4Eu61qvbLa/IgRUnLRwGUiHY4CN7Q8+6kNn2cu0nNb2bc+S01jB9PjC+lrkP39ant9f1fY3qWkN3blhLH7OsMaQ9tgs0c/fwCRpyNl95LYodL3Zzi/F61G0PPJL/B2jCGYwFPMsjIj+O6PwF+8k9iAnmA/hUdIQ7+a2l+/Pe9HrPstJD4V99Q922INBYLvgIkvCh7HIV9NDfJ3Ok8tA9PvvGXJ4y12aWvP6QYEfdDFcX6Yrc3NraVMMsz+UhkznHiLdTrj5UwFlmro4a0iRzKeEAOfBmb/pgeD8eESR2IGaZiFsGcLQ0RHFb477fiMJzCstLm/gfhlO6pOvbTMKItEswqePoJI9g0AxQT2Ib8F58Hp91G3U7kbtubZGIT4OZAv6ePj0WnL4FojFWM8TirmPkbVeKwBggxuI85BQO2XE8HhdJPZSz+vzUPPHZbspPdqMaEbk5WgnHv10TmL83VKof48sA4GxfDuXm+NlTan4sWgdPNKpSow=

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.3)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -248,6 +248,7 @@ set(SRC
     src/jaegertracing/utils/ErrorUtil.cpp
     src/jaegertracing/utils/HexParsing.cpp
     src/jaegertracing/utils/RateLimiter.cpp
+    src/jaegertracing/utils/Regex.cpp
     src/jaegertracing/utils/UDPClient.cpp
     src/jaegertracing/utils/YAML.cpp)
 
@@ -305,7 +306,7 @@ if(BUILD_TESTING)
       src/jaegertracing/utils/UDPClientTest.cpp)
   add_executable(UnitTest ${TEST_SRC})
   target_compile_definitions(UnitTest PUBLIC
-      GTEST_HAS_TR1_TUPLE=0
+      GTEST_HAS_TR1_TUPLE=1
       GTEST_USE_OWN_TR1_TUPLE=0)
   target_link_libraries(
       UnitTest testutils GTest::main jaegertracing-static ${LIBS})

crossdock/Dockerfile

@@ -1,8 +1,7 @@
 FROM gcc:7.2
 
 WORKDIR /
-RUN curl -O https://cmake.org/files/v3.10/cmake-3.10.0-rc5-Linux-x86_64.sh && \
-    bash cmake-3.10.0-rc5-Linux-x86_64.sh --skip-license
+RUN curl -O https://cmake.org/files/v3.10/cmake-3.10.0-rc5-Linux-x86_64.sh && bash cmake-3.10.0-rc5-Linux-x86_64.sh --skip-license
 
 COPY . /app/jaegertracing
 RUN rm -rf /app/jaegertracing/build && \