Merge branch 'release/2.0.1'

Author: bmgandre

.travis.yml

@@ -1,43 +1,47 @@
+dist: focal
 language: c++
 sudo: true
 matrix:
   include:
     - os: linux
       compiler: clang
       env:
-        - CONAN_ARGS="-s arch=x86_64 -s build_type=Release -s compiler=clang -s compiler.libcxx=libstdc++ -s compiler.version=3.5 --build"
-        - CXX=clang++-3.5
-        - CC=clang-3.5
+        - CONAN_ARGS="-s arch=x86_64 -s build_type=Release -s compiler=clang -s compiler.libcxx=libstdc++11 -s compiler.version=11 --build"
+        - CXX=clang++-11
+        - CC=clang-11
         - CMAKE_CXX_FLAGS="-Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage"
         - CMAKE_EXE_LINKER_FLAGS="--coverage"
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+            - sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
           packages:
-            - g++-4.9
-            - clang-3.5
+            - clang-tools-11
+            - clang-11
+            - cmake
             - lcov
     - os: linux
       compiler: gcc
       env:
-        - CONAN_ARGS="-s arch=x86_64 -s build_type=Release -s compiler=gcc -s compiler.libcxx=libstdc++ -s compiler.version=4.9 --build"
-        - CXX=g++-4.9
-        - CC=gcc-4.9
+        - CONAN_ARGS="-s arch=x86_64 -s build_type=Release -s compiler=gcc -s compiler.libcxx=libstdc++11 -s compiler.version=10 --build"
+        - CXX=g++-10
+        - CC=gcc-10
         - CMAKE_CXX_FLAGS="-Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage"
         - CMAKE_EXE_LINKER_FLAGS="-coverage -lgcov"
       addons:
         apt:
           sources:
-            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
           packages:
-            - g++-4.9
+            - g++-10
+            - cmake
             - lcov
 
 install:
-  - "[ $CXX = g++ ] && export CXX=g++-4.9 || true"
-  - "[ $CXX = clang++ ] && export CXX=clang++-3.5 || true"
+  - "[ $CXX = g++ ] && export CXX=g++-10 || true"
+  - "[ $CXX = clang++ ] && export CXX=clang++-11 || true"
 
 before_script:
   - sudo pip install conan
@@ -53,7 +57,7 @@ script:
 
 after_success:
   - |
-    if [ "$CXX" = "g++-4.9" ]; then
+    if [ "$CXX" = "g++-10" ]; then
       cd ${TRAVIS_BUILD_DIR}
       lcov --directory . --capture --output-file coverage.info # capture coverage info
       lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system

README.md

@@ -47,22 +47,14 @@ This will create the following directory structure:
 ```
 hackerrank-cpp
 |-- src
-|   |-- CMakeLists.txt
+|   |
 |   +-- algorithms
-|       |-- CMakeLists.txt
+|       |
 |       +-- implementation
-|           |-- CMakeLists.txt
+|           |
 |           +-- diagonal_difference
 |               |-- diagonal_difference.cpp
 |               |-- diagonal_difference.h
+|               |-- diagonal_difference_test.cpp
 |               +-- CMakeLists.txt
-+-- test
-    |-- CMakeLists.txt
-    +-- algorithms
-        |-- CMakeLists.txt
-        +-- implementation
-            |-- CMakeLists.txt
-            +-- diagonal_difference
-                |-- diagonal_difference_test.cpp
-                +-- CMakeLists.txt
 ```

appveyor.yml

@@ -1,22 +1,42 @@
 version: '{build}'
 
-os: Visual Studio 2015
+os: Visual Studio 2019
 
 environment:
   matrix:
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015"
-      conan_args: "-s arch=x86 -s build_type=Release -s compiler=\"Visual Studio\" -s compiler.version=14 --build"
-
-    - compiler: msvc-14-seh
-      generator: "Visual Studio 14 2015 Win64"
-      conan_args: "-s arch=x86_64 -s build_type=Release -s compiler=\"Visual Studio\" -s compiler.version=14 --build"
-
-configuration:
-  - Debug
-
-build:
-  verbosity: detailed
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      compiler: msvc-15-seh
+      generator: "Visual Studio 15 2017 Win64"
+      platform: "x64"
+      configuration: "Debug"
+      build_system: cmake
+      conan_args: "-s arch=x86_64 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=15 --build"
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      compiler: msvc-15-seh
+      generator: "Visual Studio 15 2017"
+      platform: "Win32"
+      configuration: "Debug"
+      build_system: cmake
+      conan_args: "-s arch=x86 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=15 --build"
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      compiler: msvc-16-seh
+      generator: "Visual Studio 16 2019"
+      platform: "x64"
+      configuration: "Debug"
+      arch: "-A x64"
+      build_system: cmake
+      conan_args: "-s arch=x86_64 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=16 --build"
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      compiler: msvc-16-seh
+      generator: "Visual Studio 16 2019"
+      platform: "Win32"
+      configuration: "Debug"
+      arch: "-A Win32"
+      build_system: cmake
+      conan_args: "-s arch=x86 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=16 --build"
 
 install:
   - cmd: |
@@ -32,10 +52,10 @@ build_script:
          cd build
          echo conan install ../conanfile.txt %conan_args%
          conan install ../conanfile.txt %conan_args%
-         echo cmake -G "%generator%" -DUSE_CONAN_LIBS=true -DCMAKE_VERBOSE_MAKEFILE=true ..
-         cmake -G "%generator%" -DUSE_CONAN_LIBS=true -DCMAKE_VERBOSE_MAKEFILE=true ..
-         echo msbuild /m hackerrank.sln
-         msbuild /m hackerrank.sln
+         echo cmake -G "%generator%" %arch% -DUSE_CONAN_LIBS=true -DCMAKE_VERBOSE_MAKEFILE=true ..
+         cmake -G "%generator%" %arch% -DUSE_CONAN_LIBS=true -DCMAKE_VERBOSE_MAKEFILE=true ..
+         echo msbuild /m hackerrank.sln /p:Configuration=%configuration% /p:Platform=%platform%
+         msbuild /m hackerrank.sln /p:Configuration=%configuration% /p:Platform=%platform%
 
 test_script:
   - cmd: |

scripts/cmake/hackerrank_challenge.cmake

@@ -46,4 +46,7 @@ macro(hackerrank_challenge_test)
 
 	file(GLOB GTEST_BINARIES "${PROJECT_BINARY_DIR}/bin/gtest*")
 	file(COPY ${GTEST_BINARIES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+	file(GLOB GMOCK_BINARIES "${PROJECT_BINARY_DIR}/bin/gmock*")
+	file(COPY ${GMOCK_BINARIES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 endmacro()