Merge pull request #197 from hunter-packages/hunter

Add support for Hunter package manager

Author: cinemast

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+dist: trusty
 
 before_install:
  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
@@ -25,9 +26,9 @@ env:
 compiler:
   - gcc
 
-script: 
+script:
     - mkdir -p build && cd build
-    - cmake -DCMAKE_BUILD_TYPE=Debug -DHTTP_CLIENT=${HTTP_CLIENT} -DHTTP_SERVER=${HTTP_SERVER} -DCOMPILE_STUBGEN=${COMPILE_STUBGEN} .. 
+    - cmake -DCMAKE_BUILD_TYPE=Debug -DHTTP_CLIENT=${HTTP_CLIENT} -DHTTP_SERVER=${HTTP_SERVER} -DCOMPILE_STUBGEN=${COMPILE_STUBGEN} ..
     - make
     - make test
     - sudo make install && sudo ldconfig

CMakeLists.txt

@@ -1,7 +1,18 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
+
+# setup directory where we should look for cmake files
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+option(HUNTER_ENABLED "Enable Hunter package manager" NO)
+include(HunterGate)
+HunterGate(
+	URL "https://github.com/ruslo/hunter/archive/v0.18.47.tar.gz"
+	SHA1 "f0c476a3a0f9edd6182936d8c4460811f112189c"
+)
+
 project(libjson-rpc-cpp)
 
-# list command no longer ignores empty elements 
+# list command no longer ignores empty elements
 cmake_policy(SET CMP0007 NEW)
 cmake_policy(SET CMP0012 NEW)
 
@@ -38,6 +49,8 @@ set(COMPILE_TESTS YES CACHE BOOL "Compile test framework")
 set(COMPILE_STUBGEN YES CACHE BOOL "Compile the stubgenerator")
 set(COMPILE_EXAMPLES YES CACHE BOOL "Compile example programs")
 
+option(WITH_COVERAGE "Build with code coverage flags" ON)
+
 # print actual settings
 if(UNIX)
 	message(STATUS "UNIX_DOMAIN_SOCKET_SERVER: ${UNIX_DOMAIN_SOCKET_SERVER}")
@@ -55,9 +68,6 @@ message(STATUS "COMPILE_TESTS: ${COMPILE_TESTS}")
 message(STATUS "COMPILE_STUBGEN: ${COMPILE_STUBGEN}")
 message(STATUS "COMPILE_EXAMPLES: ${COMPILE_EXAMPLES}")
 
-# setup directory where we should look for cmake files
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-
 # setup compiler settings && dependencies
 include(CMakeCompilerSettings)
 include(CMakeDependencies)
@@ -67,10 +77,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 
-if (WIN32)
-	set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/dist)
-endif()
-
 # setup global include_directories (for backwards compatibility)
 include_directories("${CMAKE_BINARY_DIR}/gen/")
 include_directories("${CMAKE_BINARY_DIR}/gen/jsonrpccpp/common")
@@ -90,7 +96,7 @@ endif()
 
 # setup test suite
 if (COMPILE_TESTS)
-        enable_testing(true)
+	enable_testing()
 	add_subdirectory(src/test)
 endif()
 
@@ -114,5 +120,31 @@ add_custom_target(
 	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 )
 
+# CMake package
+set(package_name "libjson-rpc-cpp")
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+set(config_install_destination ${CMAKE_INSTALL_LIBDIR}/${package_name}/cmake)
+configure_package_config_file(
+	cmake/${package_name}Config.cmake.in ${package_name}Config.cmake
+	INSTALL_DESTINATION ${config_install_destination}
+)
+write_basic_package_version_file(
+	${package_name}ConfigVersion.cmake
+	VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
+	COMPATIBILITY ExactVersion
+)
+install(
+	EXPORT ${package_name}Targets
+	DESTINATION ${config_install_destination}
+	NAMESPACE ${package_name}::
+)
+install(
+	FILES
+	${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake
+	${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake
+	DESTINATION ${config_install_destination}
+)
+
 # packaging stuff
 include(CMakePackaging)

cmake/CMakeCompilerSettings.cmake

@@ -2,8 +2,11 @@
 
 
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-        set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wformat -Wno-format-extra-args -Wformat-security -Wformat-nonliteral -Wformat=2 -Wextra -Wnon-virtual-dtor -fprofile-arcs -ftest-coverage -fPIC -O0")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wformat -Wno-format-extra-args -Wformat-security -Wformat-nonliteral -Wformat=2 -Wextra -Wnon-virtual-dtor -fPIC -O0")
+    if(WITH_COVERAGE)
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+    endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 # TODO figure clang stuff to enable test-coverage
 # Instrument Program flow should be set to Yes

cmake/CMakeDependencies.cmake

@@ -10,10 +10,16 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${CMAKE_SOURCE_DIR}/win32-deps")
 # find JSONCPP
 # TODO: handle windows debug libraries!
 # TODO: fix FindJSONCPP file!
-find_package(Jsoncpp)
-message(STATUS "Jsoncpp header: ${JSONCPP_INCLUDE_DIRS}")
-message(STATUS "Jsoncpp lib   : ${JSONCPP_LIBRARIES}")
-message(STATUS "Jsoncpp prefix: ${JSONCPP_INCLUDE_PREFIX}")
+if(HUNTER_ENABLED)
+	hunter_add_package(jsoncpp)
+	find_package(jsoncpp CONFIG REQUIRED)
+	set(JSONCPP_INCLUDE_PREFIX "json")
+else()
+	find_package(Jsoncpp REQUIRED)
+	message(STATUS "Jsoncpp header: ${JSONCPP_INCLUDE_DIR}")
+	message(STATUS "Jsoncpp lib   : ${JSONCPP_LIBRARY}")
+	message(STATUS "Jsoncpp prefix: ${JSONCPP_INCLUDE_PREFIX}")
+endif()
 
 # find Threads!
 find_package(Threads)
@@ -27,10 +33,15 @@ if(${COMPILE_STUBGEN})
 endif()
 
 if(${HTTP_CLIENT})
-# find CURL
-	find_package(CURL REQUIRED)
-	message(STATUS "CURL header: ${CURL_INCLUDE_DIRS}")
-	message(STATUS "CURL lib   : ${CURL_LIBRARIES}")
+	# find CURL
+	if(HUNTER_ENABLED)
+		hunter_add_package(CURL)
+		find_package(CURL CONFIG REQUIRED)
+	else()
+		find_package(CURL REQUIRED)
+		message(STATUS "CURL header: ${CURL_INCLUDE_DIR}")
+		message(STATUS "CURL lib   : ${CURL_LIBRARY}")
+	endif()
 endif()
 
 if (${HTTP_SERVER})

cmake/FindCURL.cmake

@@ -1,17 +1,17 @@
 # Find CURL
 #
 # Find the curl includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
+#
+# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH
+#
 # This module defines
-#  CURL_INCLUDE_DIRS, where to find header, etc.
-#  CURL_LIBRARIES, the libraries needed to use curl.
+#  CURL_INCLUDE_DIR, where to find header, etc.
+#  CURL_LIBRARY, the libraries needed to use curl.
 #  CURL_FOUND, If false, do not try to use curl.
 
 # only look in default directories
 find_path(
-	CURL_INCLUDE_DIR 
+	CURL_INCLUDE_DIR
 	NAMES curl/curl.h
 	DOC "curl include dir"
 )
@@ -23,8 +23,13 @@ find_library(
 	DOC "curl library"
 )
 
-set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
-set(CURL_LIBRARIES ${CURL_LIBRARY})
+add_library(CURL::libcurl UNKNOWN IMPORTED)
+set_target_properties(
+	CURL::libcurl
+	PROPERTIES
+	IMPORTED_LOCATION "${CURL_LIBRARY}"
+	INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}"
+)
 
 # debug library on windows
 # same naming convention as in qt (appending debug library with d)
@@ -35,9 +40,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 		NAMES curld libcurld
 		DOC "curl debug library"
 	)
-	
-	set(CURL_LIBRARIES optimized ${CURL_LIBRARIES} debug ${CURL_LIBRARY_DEBUG})
 
+	set_target_properties(
+		CURL::libcurl
+		PROPERTIES
+		IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}"
+	)
+	set(CURL_LIBRARY optimized ${CURL_LIBRARY} debug ${CURL_LIBRARY_DEBUG})
 endif()
 
 # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE
@@ -46,4 +55,3 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CURL DEFAULT_MSG
 	CURL_INCLUDE_DIR CURL_LIBRARY)
 mark_as_advanced (CURL_INCLUDE_DIR CURL_LIBRARY)
-

cmake/FindJsoncpp.cmake

@@ -1,19 +1,20 @@
 # Find jsoncpp
 #
 # Find the jsoncpp includes and library
-# 
-# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH 
-# 
+#
+# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH
+#
 # This module defines
-#  JSONCPP_INCLUDE_DIRS, where to find header, etc.
-#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
+#  JSONCPP_INCLUDE_DIR, where to find header, etc.
+#  JSONCPP_LIBRARY, the libraries needed to use jsoncpp.
 #  JSONCPP_FOUND, If false, do not try to use jsoncpp.
-#  JSONCPP_INCLUDE_PREFIX, include prefix for jsoncpp
+#  JSONCPP_INCLUDE_PREFIX, include prefix for jsoncpp.
+#  jsoncpp_lib_static imported library.
 
 # only look in default directories
 find_path(
-	JSONCPP_INCLUDE_DIR 
-	NAMES jsoncpp/json/json.h json/json.h
+	JSONCPP_INCLUDE_DIR
+	NAMES json/json.h jsoncpp/json/json.h
 	DOC "jsoncpp include dir"
 )
 
@@ -23,8 +24,13 @@ find_library(
 	DOC "jsoncpp library"
 )
 
-set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
-set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+add_library(jsoncpp_lib_static UNKNOWN IMPORTED)
+set_target_properties(
+	jsoncpp_lib_static
+	PROPERTIES
+	IMPORTED_LOCATION "${JSONCPP_LIBRARY}"
+	INTERFACE_INCLUDE_DIRECTORIES "${JSONCPP_INCLUDE_DIR}"
+)
 
 # debug library on windows
 # same naming convention as in qt (appending debug library with d)
@@ -35,8 +41,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 		NAMES jsoncppd
 		DOC "jsoncpp debug library"
 	)
-	
-	set(JSONCPP_LIBRARIES optimized ${JSONCPP_LIBRARIES} debug ${JSONCPP_LIBRARY_DEBUG})
+
+	set_target_properties(
+		jsoncpp_lib_static
+		PROPERTIES
+		IMPORTED_LOCATION_DEBUG "${JSONCPP_LIBRARY_DEBUG}"
+	)
+	set(JSONCPP_LIBRARY optimized ${JSONCPP_LIBRARY} debug ${JSONCPP_LIBRARY_DEBUG})
 
 endif()
 
@@ -53,10 +64,11 @@ else()
 	set(JSONCPP_INCLUDE_PREFIX "json")
 endif()
 
+
+
 # handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE
 # if all listed variables are TRUE, hide their existence from configuration view
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(jsoncpp DEFAULT_MSG
 	JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
 mark_as_advanced (JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
-