Merge branch 'release/2.1.3'

Author: bmgandre

appveyor.yml .appveyor.ymlappveyor.yml renamed to .appveyor.yml

@@ -11,6 +11,8 @@ environment:
       configuration: "Debug"
       build_system: cmake
       conan_args: "-s arch=x86_64 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=15 --build"
+      boost_root: C:/Libraries/boost_1_69_0
+      boost_lib: C:/Libraries/boost_1_69_0/lib64-msvc-14.0
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       compiler: msvc-15-seh
@@ -19,6 +21,8 @@ environment:
       configuration: "Debug"
       build_system: cmake
       conan_args: "-s arch=x86 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=15 --build"
+      boost_root: C:/Libraries/boost_1_69_0
+      boost_lib: C:/Libraries/boost_1_69_0/lib32-msvc-14.0
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       compiler: msvc-16-seh
@@ -28,6 +32,8 @@ environment:
       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"
+      boost_root: C:/Libraries/boost_1_71_0
+      boost_lib: C:/Libraries/boost_1_71_0/lib64-msvc-14.0
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       compiler: msvc-16-seh
@@ -37,6 +43,8 @@ environment:
       arch: "-A Win32"
       build_system: cmake
       conan_args: "-s arch=x86 -s build_type=Debug -s compiler=\"Visual Studio\" -s compiler.version=16 --build"
+      boost_root: C:/Libraries/boost_1_71_0
+      boost_lib: C:/Libraries/boost_1_71_0/lib32-msvc-14.0
 
 install:
   - cmd: |
@@ -50,10 +58,10 @@ build_script:
   - cmd: |
          mkdir build
          cd build
-         echo conan install ../conanfile.txt %conan_args%
-         conan install ../conanfile.txt %conan_args%
-         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 conan install ../.conan/conanfile_noboost.txt %conan_args%
+         conan install ../.conan/conanfile_noboost.txt %conan_args%
+         echo cmake -G "%generator%" %arch% -DUSE_CONAN_JSONCPP=ON -DUSE_CONAN_GTEST=ON -DBOOST_ROOT="%boost_root%" -DBOOST_LIBRARYDIR="%boost_lib%" -DBoost_USE_STATIC_LIBS=ON ..
+         cmake -G "%generator%" %arch% -DUSE_CONAN_JSONCPP=ON -DUSE_CONAN_GTEST=ON -DBOOST_ROOT="%boost_root%" -DBOOST_LIBRARYDIR="%boost_lib%" -DBoost_USE_STATIC_LIBS=ON ..
          echo msbuild /m hackerrank.sln /p:Configuration=%configuration% /p:Platform=%platform%
          msbuild /m hackerrank.sln /p:Configuration=%configuration% /p:Platform=%platform%
 

.conan/conanfile_noboost.txt

@@ -0,0 +1,13 @@
+[requires]
+gtest/1.10.0
+jsoncpp/1.9.4
+
+[generators]
+cmake
+
+[options]
+gtest:shared=True
+
+[imports]
+bin, *.dll -> ./bin
+lib, *.dylib* -> ./bin

.travis.yml

@@ -13,6 +13,7 @@ matrix:
         - CMAKE_EXE_LINKER_FLAGS="--coverage"
       addons:
         apt:
+          update: true
           sources:
             - sourceline: 'ppa:ubuntu-toolchain-r/test'
             - sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main'
@@ -22,6 +23,7 @@ matrix:
             - clang-11
             - cmake
             - lcov
+            - libboost1.71-all-dev
     - os: linux
       compiler: gcc
       env:
@@ -32,12 +34,14 @@ matrix:
         - CMAKE_EXE_LINKER_FLAGS="-coverage -lgcov"
       addons:
         apt:
+          update: true
           sources:
             - sourceline: 'ppa:ubuntu-toolchain-r/test'
           packages:
             - g++-10
             - cmake
             - lcov
+            - libboost1.71-all-dev
 
 install:
   - "[ $CXX = g++ ] && export CXX=g++-10 || true"
@@ -50,8 +54,8 @@ script:
   - |
     mkdir build
     cd build
-    conan install ../conanfile.txt ${CONAN_ARGS}
-    cmake -DUSE_CONAN_LIBS=true -DCMAKE_VERBOSE_MAKEFILE=true -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}" ..
+    conan install ../.conan/conanfile_noboost.txt ${CONAN_ARGS}
+    cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}" -DUSE_CONAN_JSONCPP=ON -DUSE_CONAN_GTEST=ON ..
     make -j
     make test ARGS="-j -V"
 

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
+}

CMakeLists.txt

@@ -5,25 +5,24 @@ project(hackerrank)
 
 set(CMAKE_BUILD_TYPE Debug)
 
-set(USE_CONAN_LIBS FALSE CACHE BOOL "Download Conan libraries")
+set(USE_CONAN_BOOST FALSE CACHE BOOL "Download Boost from Conan Repo")
+set(USE_CONAN_JSONCPP FALSE CACHE BOOL "Download JsonCpp from Conan Repo")
+set(USE_CONAN_GTEST FALSE CACHE BOOL "Download GTest from Conan Repo")
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-include(${CMAKE_SOURCE_DIR}/scripts/cmake/compiler_check.cmake)
-include(${CMAKE_SOURCE_DIR}/scripts/cmake/list_folders.cmake)
-include(${CMAKE_SOURCE_DIR}/scripts/cmake/project_add_all_folders.cmake)
-include(${CMAKE_SOURCE_DIR}/scripts/cmake/conan_custom_setup.cmake)
-include(${CMAKE_SOURCE_DIR}/scripts/cmake/hackerrank_challenge.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/compiler_check.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/list_folders.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/project_add_all_folders.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/conan_custom_setup.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/hackerrank_challenge.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/build_dependencies.cmake)
 
 compiler_check()
 
-if (USE_CONAN_LIBS)
-	include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-	conan_custom_setup()
-else()
-	find_package(PkgConfig REQUIRED)
-	pkg_check_modules(JsonCpp REQUIRED jsoncpp>=1.9.4)
-	find_package(Boost 1.68.0)
-endif (USE_CONAN_LIBS)
+enable_testing()
+
+check_build_dependencies()
 
 include(CTest)
 

cmake/build_dependencies.cmake

@@ -0,0 +1,27 @@
+macro(check_build_dependencies)
+    set(USE_CONAN_LIBS false)
+
+    if(USE_CONAN_BOOST)
+        set(USE_CONAN_LIBS true)
+    else()
+        find_package(Boost 1.68.0 REQUIRED)
+    endif()
+
+    if(USE_CONAN_JSONCPP)
+        set(USE_CONAN_LIBS true)
+    else()
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(JsonCpp REQUIRED jsoncpp>=1.9.4)
+    endif()
+
+    if(USE_CONAN_GTEST)
+        set(USE_CONAN_LIBS true)
+    else()
+        find_package(GTest 1.7 REQUIRED)
+    endif()
+
+    if (USE_CONAN_LIBS)
+        include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+        conan_custom_setup()
+    endif()
+endmacro()

scripts/cmake/compiler_check.cmake cmake/compiler_check.cmakescripts/cmake/compiler_check.cmake renamed to cmake/compiler_check.cmake

@@ -40,10 +40,7 @@ macro(hackerrank_challenge_test)
 	if (USE_CONAN_LIBS)
 		target_link_libraries(${ProjectTest} ${ProjectId} ${TestBaseProject} ${CONAN_LIBS})
 	else()
-		#   GTest
-		find_package(GTest REQUIRED)
 		include_directories(${GTEST_INCLUDE_DIRS})
-
 		target_link_libraries(${ProjectTest} ${ProjectId} ${TestBaseProject} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} pthread)
 	endif (USE_CONAN_LIBS)