Merge branch 'release/2.1.1'

Author: bmgandre

CMakeLists.txt

@@ -14,12 +14,15 @@ 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)
 
-
 compiler_check()
 
 if (USE_CONAN_LIBS)
-    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-    conan_custom_setup()
+	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)
 
 include(CTest)

conanfile.txt

@@ -1,6 +1,7 @@
 [requires]
 gtest/1.10.0
 boost/1.69.0
+jsoncpp/1.9.4
 
 [generators]
 cmake

scripts/cmake/hackerrank_challenge.cmake

@@ -13,12 +13,11 @@ macro(hackerrank_setup_project)
 	set_target_properties(${ProjectId} PROPERTIES FOLDER "${ProjectFolder}")
 
 	if (USE_CONAN_LIBS)
-		target_link_libraries(${ProjectId} ${CONAN_LIBS})	
+		target_link_libraries(${ProjectId} ${CONAN_LIBS} m)
 	else()
-        find_package(Boost 1.68.0)
-        include_directories(${Boost_INCLUDE_DIRS})
-        target_link_libraries(${ProjectId} ${Boost_LIBRARIES})
-    endif (USE_CONAN_LIBS)
+		include_directories(${Boost_INCLUDE_DIRS} ${JsonCpp_INCLUDE_DIRS})
+		target_link_libraries(${ProjectId} ${Boost_LIBRARIES} ${JsonCpp_LIBRARIES} m)
+	endif (USE_CONAN_LIBS)
 endmacro()
 
 macro(hackerrank_challenge_solution)
@@ -42,11 +41,11 @@ macro(hackerrank_challenge_test)
 		target_link_libraries(${ProjectTest} ${ProjectId} ${TestBaseProject} ${CONAN_LIBS})
 	else()
 		#   GTest
-	  find_package(GTest REQUIRED)
-	  include_directories(${GTEST_INCLUDE_DIRS})
+		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)
+		target_link_libraries(${ProjectTest} ${ProjectId} ${TestBaseProject} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} pthread)
+	endif (USE_CONAN_LIBS)
 
 	set_property(TARGET ${ProjectTest} PROPERTY CXX_STANDARD 14)
 	set_property(TARGET ${ProjectTest} PROPERTY CXX_STANDARD_REQUIRED ON)

scripts/setup-new-problem

@@ -66,7 +66,7 @@ function write_header_file {
 	done
 
 	echo -ne "#ifndef ${problem_name^^}_H
-#define ${problem_name^^}_H 
+#define ${problem_name^^}_H
 
 namespace hackerrank {
 namespace bmgandre {${ns_begin}