From 77a6d7d4ce700cd8f8e4f01aad3a8badb91923f3 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Wed, 27 Sep 2017 13:20:33 -0400 Subject: [PATCH 1/4] Backport Hunter changes to version 0.10.0. --- CMakeLists.txt | 10 +- build/cmake/Config.cmake.in | 8 + build/cmake/DefineOptions.cmake | 32 +- build/cmake/HunterGate.cmake | 540 +++++++++++++++++++++++++++ build/cmake/ThriftMacros.cmake | 21 +- compiler/cpp/CMakeLists.txt | 4 +- lib/cpp/CMakeLists.txt | 102 ++++- lib/cpp/src/thrift/qt/CMakeLists.txt | 4 +- tutorial/cpp/CMakeLists.txt | 2 - 9 files changed, 665 insertions(+), 58 deletions(-) create mode 100644 build/cmake/Config.cmake.in create mode 100644 build/cmake/HunterGate.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ed8d2ac58..9989c19b5b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,14 @@ # under the License. # -cmake_minimum_required(VERSION 2.8.12) - -project("Apache Thrift") +cmake_minimum_required(VERSION 3.1) set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake") +include(HunterGate) +HunterGate(URL "https://github.com/ruslo/hunter/archive/v0.19.112.tar.gz" + SHA1 "74cd301e87d79c09133b4ee252f202cd489203d8") + # TODO: add `git rev-parse --short HEAD` # Read the version information from the Autoconf file file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC REGEX "AC_INIT\\(.*\\)" ) @@ -38,6 +40,8 @@ string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" thrift_VERSION_MINOR ${t string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" thrift_VERSION_PATCH ${thrift_VERSION}) message(STATUS "Parsed Thrift version: ${thrift_VERSION} (${thrift_VERSION_MAJOR}.${thrift_VERSION_MINOR}.${thrift_VERSION_PATCH})") +project(thrift VERSION ${thrift_VERSION}) + # Some default settings include(DefineCMakeDefaults) diff --git a/build/cmake/Config.cmake.in b/build/cmake/Config.cmake.in new file mode 100644 index 00000000000..fdecd42187a --- /dev/null +++ b/build/cmake/Config.cmake.in @@ -0,0 +1,8 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(Libevent) +check_required_components("@PROJECT_NAME@") + +include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake index 0c853b1ce4a..c55730fc730 100644 --- a/build/cmake/DefineOptions.cmake +++ b/build/cmake/DefineOptions.cmake @@ -50,40 +50,25 @@ endif() # C++ option(WITH_CPP "Build C++ Thrift library" ON) if(WITH_CPP) - find_package(Boost 1.53 QUIET) # NOTE: Currently the following options are C++ specific, # but in future other libraries might reuse them. # So they are not dependent on WITH_CPP but setting them without WITH_CPP currently # has no effect. - if(ZLIB_LIBRARY) - # FindZLIB.cmake does not normalize path so we need to do it ourselves. - file(TO_CMAKE_PATH ${ZLIB_LIBRARY} ZLIB_LIBRARY) - endif() - find_package(ZLIB QUIET) - CMAKE_DEPENDENT_OPTION(WITH_ZLIB "Build with ZLIB support" ON - "ZLIB_FOUND" OFF) - find_package(Libevent QUIET) - CMAKE_DEPENDENT_OPTION(WITH_LIBEVENT "Build with libevent support" ON - "Libevent_FOUND" OFF) - find_package(Qt4 QUIET COMPONENTS QtCore QtNetwork) - CMAKE_DEPENDENT_OPTION(WITH_QT4 "Build with Qt4 support" ON - "QT4_FOUND" OFF) - find_package(Qt5 QUIET COMPONENTS Core Network) - CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON - "Qt5_FOUND" OFF) + option(WITH_ZLIB "Build with ZLIB support" ON) + option(WITH_LIBEVENT "Build with libevent support" ON) + option(WITH_QT4 "Build with Qt4 support" ON) + option(WITH_QT5 "Build with Qt5 support" ON) if(${WITH_QT4} AND ${WITH_QT5} AND ${CMAKE_MAJOR_VERSION} LESS 3) # cmake < 3.0.0 causes conflict when building both Qt4 and Qt5 set(WITH_QT4 OFF) endif() - find_package(OpenSSL QUIET) - CMAKE_DEPENDENT_OPTION(WITH_OPENSSL "Build with OpenSSL support" ON - "OPENSSL_FOUND" OFF) + option(WITH_OPENSSL "Build with OpenSSL support" ON) option(WITH_STDTHREADS "Build with C++ std::thread support" OFF) CMAKE_DEPENDENT_OPTION(WITH_BOOSTTHREADS "Build with Boost threads support" OFF - "NOT WITH_STDTHREADS;Boost_FOUND" OFF) + "NOT WITH_STDTHREADS" OFF) endif() CMAKE_DEPENDENT_OPTION(BUILD_CPP "Build C++ library" ON - "BUILD_LIBRARIES;WITH_CPP;Boost_FOUND" OFF) + "BUILD_LIBRARIES;WITH_CPP" OFF) CMAKE_DEPENDENT_OPTION(WITH_PLUGIN "Build compiler plugin support" ON "BUILD_COMPILER;BUILD_CPP" OFF) @@ -104,7 +89,8 @@ if(BUILD_CPP) list(APPEND boost_components unit_test_framework filesystem chrono program_options) endif() if(boost_components) - find_package(Boost 1.53 REQUIRED COMPONENTS ${boost_components}) + hunter_add_package(Boost COMPONENTS ${boost_components}) + find_package(Boost CONFIG REQUIRED ${boost_components}) endif() elseif(BUILD_C_GLIB AND BUILD_TESTING) find_package(Boost 1.53 REQUIRED) diff --git a/build/cmake/HunterGate.cmake b/build/cmake/HunterGate.cmake new file mode 100644 index 00000000000..3a8043d2b10 --- /dev/null +++ b/build/cmake/HunterGate.cmake @@ -0,0 +1,540 @@ +# Copyright (c) 2013-2017, Ruslan Baratov +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# This is a gate file to Hunter package manager. +# Include this file using `include` command and add package you need, example: +# +# cmake_minimum_required(VERSION 3.0) +# +# include("cmake/HunterGate.cmake") +# HunterGate( +# URL "https://github.com/path/to/hunter/archive.tar.gz" +# SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d" +# ) +# +# project(MyProject) +# +# hunter_add_package(Foo) +# hunter_add_package(Boo COMPONENTS Bar Baz) +# +# Projects: +# * https://github.com/hunter-packages/gate/ +# * https://github.com/ruslo/hunter + +option(HUNTER_ENABLED "Enable Hunter package manager support" ON) +if(HUNTER_ENABLED) + if(CMAKE_VERSION VERSION_LESS "3.0") + message(FATAL_ERROR "At least CMake version 3.0 required for hunter dependency management." + " Update CMake or set HUNTER_ENABLED to OFF.") + endif() +endif() + +include(CMakeParseArguments) # cmake_parse_arguments + +option(HUNTER_STATUS_PRINT "Print working status" ON) +option(HUNTER_STATUS_DEBUG "Print a lot info" OFF) + +set(HUNTER_WIKI "https://github.com/ruslo/hunter/wiki") + +function(hunter_gate_status_print) + foreach(print_message ${ARGV}) + if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG) + message(STATUS "[hunter] ${print_message}") + endif() + endforeach() +endfunction() + +function(hunter_gate_status_debug) + foreach(print_message ${ARGV}) + if(HUNTER_STATUS_DEBUG) + string(TIMESTAMP timestamp) + message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}") + endif() + endforeach() +endfunction() + +function(hunter_gate_wiki wiki_page) + message("------------------------------ WIKI -------------------------------") + message(" ${HUNTER_WIKI}/${wiki_page}") + message("-------------------------------------------------------------------") + message("") + message(FATAL_ERROR "") +endfunction() + +function(hunter_gate_internal_error) + message("") + foreach(print_message ${ARGV}) + message("[hunter ** INTERNAL **] ${print_message}") + endforeach() + message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") + message("") + hunter_gate_wiki("error.internal") +endfunction() + +function(hunter_gate_fatal_error) + cmake_parse_arguments(hunter "" "WIKI" "" "${ARGV}") + string(COMPARE EQUAL "${hunter_WIKI}" "" have_no_wiki) + if(have_no_wiki) + hunter_gate_internal_error("Expected wiki") + endif() + message("") + foreach(x ${hunter_UNPARSED_ARGUMENTS}) + message("[hunter ** FATAL ERROR **] ${x}") + endforeach() + message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") + message("") + hunter_gate_wiki("${hunter_WIKI}") +endfunction() + +function(hunter_gate_user_error) + hunter_gate_fatal_error(${ARGV} WIKI "error.incorrect.input.data") +endfunction() + +function(hunter_gate_self root version sha1 result) + string(COMPARE EQUAL "${root}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("root is empty") + endif() + + string(COMPARE EQUAL "${version}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("version is empty") + endif() + + string(COMPARE EQUAL "${sha1}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("sha1 is empty") + endif() + + string(SUBSTRING "${sha1}" 0 7 archive_id) + + if(EXISTS "${root}/cmake/Hunter") + set(hunter_self "${root}") + else() + set( + hunter_self + "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked" + ) + endif() + + set("${result}" "${hunter_self}" PARENT_SCOPE) +endfunction() + +# Set HUNTER_GATE_ROOT cmake variable to suitable value. +function(hunter_gate_detect_root) + # Check CMake variable + string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty) + if(not_empty) + set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable") + return() + endif() + + # Check environment variable + string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty) + if(not_empty) + set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT detected by environment variable") + return() + endif() + + # Check HOME environment variable + string(COMPARE NOTEQUAL "$ENV{HOME}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable") + return() + endif() + + # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only) + if(WIN32) + string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug( + "HUNTER_ROOT set using SYSTEMDRIVE environment variable" + ) + return() + endif() + + string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result) + if(result) + set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE) + hunter_gate_status_debug( + "HUNTER_ROOT set using USERPROFILE environment variable" + ) + return() + endif() + endif() + + hunter_gate_fatal_error( + "Can't detect HUNTER_ROOT" + WIKI "error.detect.hunter.root" + ) +endfunction() + +macro(hunter_gate_lock dir) + if(NOT HUNTER_SKIP_LOCK) + if("${CMAKE_VERSION}" VERSION_LESS "3.2") + hunter_gate_fatal_error( + "Can't lock, upgrade to CMake 3.2 or use HUNTER_SKIP_LOCK" + WIKI "error.can.not.lock" + ) + endif() + hunter_gate_status_debug("Locking directory: ${dir}") + file(LOCK "${dir}" DIRECTORY GUARD FUNCTION) + hunter_gate_status_debug("Lock done") + endif() +endmacro() + +function(hunter_gate_download dir) + string( + COMPARE + NOTEQUAL + "$ENV{HUNTER_DISABLE_AUTOINSTALL}" + "" + disable_autoinstall + ) + if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL) + hunter_gate_fatal_error( + "Hunter not found in '${dir}'" + "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'" + "Settings:" + " HUNTER_ROOT: ${HUNTER_GATE_ROOT}" + " HUNTER_SHA1: ${HUNTER_GATE_SHA1}" + WIKI "error.run.install" + ) + endif() + string(COMPARE EQUAL "${dir}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("Empty 'dir' argument") + endif() + + string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("HUNTER_GATE_SHA1 empty") + endif() + + string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad) + if(is_bad) + hunter_gate_internal_error("HUNTER_GATE_URL empty") + endif() + + set(done_location "${dir}/DONE") + set(sha1_location "${dir}/SHA1") + + set(build_dir "${dir}/Build") + set(cmakelists "${dir}/CMakeLists.txt") + + hunter_gate_lock("${dir}") + if(EXISTS "${done_location}") + # while waiting for lock other instance can do all the job + hunter_gate_status_debug("File '${done_location}' found, skip install") + return() + endif() + + file(REMOVE_RECURSE "${build_dir}") + file(REMOVE_RECURSE "${cmakelists}") + + file(MAKE_DIRECTORY "${build_dir}") # check directory permissions + + # Disabling languages speeds up a little bit, reduces noise in the output + # and avoids path too long windows error + file( + WRITE + "${cmakelists}" + "cmake_minimum_required(VERSION 3.0)\n" + "project(HunterDownload LANGUAGES NONE)\n" + "include(ExternalProject)\n" + "ExternalProject_Add(\n" + " Hunter\n" + " URL\n" + " \"${HUNTER_GATE_URL}\"\n" + " URL_HASH\n" + " SHA1=${HUNTER_GATE_SHA1}\n" + " DOWNLOAD_DIR\n" + " \"${dir}\"\n" + " SOURCE_DIR\n" + " \"${dir}/Unpacked\"\n" + " CONFIGURE_COMMAND\n" + " \"\"\n" + " BUILD_COMMAND\n" + " \"\"\n" + " INSTALL_COMMAND\n" + " \"\"\n" + ")\n" + ) + + if(HUNTER_STATUS_DEBUG) + set(logging_params "") + else() + set(logging_params OUTPUT_QUIET) + endif() + + hunter_gate_status_debug("Run generate") + + # Need to add toolchain file too. + # Otherwise on Visual Studio + MDD this will fail with error: + # "Could not find an appropriate version of the Windows 10 SDK installed on this machine" + if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") + get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE) + set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}") + else() + # 'toolchain_arg' can't be empty + set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=") + endif() + + string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make) + if(no_make) + set(make_arg "") + else() + # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM + set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") + endif() + + execute_process( + COMMAND + "${CMAKE_COMMAND}" + "-H${dir}" + "-B${build_dir}" + "-G${CMAKE_GENERATOR}" + "${toolchain_arg}" + ${make_arg} + WORKING_DIRECTORY "${dir}" + RESULT_VARIABLE download_result + ${logging_params} + ) + + if(NOT download_result EQUAL 0) + hunter_gate_internal_error("Configure project failed") + endif() + + hunter_gate_status_print( + "Initializing Hunter workspace (${HUNTER_GATE_SHA1})" + " ${HUNTER_GATE_URL}" + " -> ${dir}" + ) + execute_process( + COMMAND "${CMAKE_COMMAND}" --build "${build_dir}" + WORKING_DIRECTORY "${dir}" + RESULT_VARIABLE download_result + ${logging_params} + ) + + if(NOT download_result EQUAL 0) + hunter_gate_internal_error("Build project failed") + endif() + + file(REMOVE_RECURSE "${build_dir}") + file(REMOVE_RECURSE "${cmakelists}") + + file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}") + file(WRITE "${done_location}" "DONE") + + hunter_gate_status_debug("Finished") +endfunction() + +# Must be a macro so master file 'cmake/Hunter' can +# apply all variables easily just by 'include' command +# (otherwise PARENT_SCOPE magic needed) +macro(HunterGate) + if(HUNTER_GATE_DONE) + # variable HUNTER_GATE_DONE set explicitly for external project + # (see `hunter_download`) + set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) + endif() + + # First HunterGate command will init Hunter, others will be ignored + get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET) + + if(NOT HUNTER_ENABLED) + # Empty function to avoid error "unknown function" + function(hunter_add_package) + endfunction() + + set( + _hunter_gate_disabled_mode_dir + "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode" + ) + if(EXISTS "${_hunter_gate_disabled_mode_dir}") + hunter_gate_status_debug( + "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}" + ) + list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}") + endif() + elseif(_hunter_gate_done) + hunter_gate_status_debug("Secondary HunterGate (use old settings)") + hunter_gate_self( + "${HUNTER_CACHED_ROOT}" + "${HUNTER_VERSION}" + "${HUNTER_SHA1}" + _hunter_self + ) + include("${_hunter_self}/cmake/Hunter") + else() + set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_LIST_DIR}") + + string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name) + if(_have_project_name) + hunter_gate_fatal_error( + "Please set HunterGate *before* 'project' command. " + "Detected project: ${PROJECT_NAME}" + WIKI "error.huntergate.before.project" + ) + endif() + + cmake_parse_arguments( + HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV} + ) + + string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1) + string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url) + string( + COMPARE + NOTEQUAL + "${HUNTER_GATE_UNPARSED_ARGUMENTS}" + "" + _have_unparsed + ) + string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global) + string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath) + + if(_have_unparsed) + hunter_gate_user_error( + "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}" + ) + endif() + if(_empty_sha1) + hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory") + endif() + if(_empty_url) + hunter_gate_user_error("URL suboption of HunterGate is mandatory") + endif() + if(_have_global) + if(HUNTER_GATE_LOCAL) + hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)") + endif() + if(_have_filepath) + hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)") + endif() + endif() + if(HUNTER_GATE_LOCAL) + if(_have_global) + hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)") + endif() + if(_have_filepath) + hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)") + endif() + endif() + if(_have_filepath) + if(_have_global) + hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)") + endif() + if(HUNTER_GATE_LOCAL) + hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)") + endif() + endif() + + hunter_gate_detect_root() # set HUNTER_GATE_ROOT + + # Beautify path, fix probable problems with windows path slashes + get_filename_component( + HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE + ) + hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}") + if(NOT HUNTER_ALLOW_SPACES_IN_PATH) + string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces) + if(NOT _contain_spaces EQUAL -1) + hunter_gate_fatal_error( + "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces." + "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error" + "(Use at your own risk!)" + WIKI "error.spaces.in.hunter.root" + ) + endif() + endif() + + string( + REGEX + MATCH + "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*" + HUNTER_GATE_VERSION + "${HUNTER_GATE_URL}" + ) + string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty) + if(_is_empty) + set(HUNTER_GATE_VERSION "unknown") + endif() + + hunter_gate_self( + "${HUNTER_GATE_ROOT}" + "${HUNTER_GATE_VERSION}" + "${HUNTER_GATE_SHA1}" + _hunter_self + ) + + set(_master_location "${_hunter_self}/cmake/Hunter") + if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter") + # Hunter downloaded manually (e.g. by 'git clone') + set(_unused "xxxxxxxxxx") + set(HUNTER_GATE_SHA1 "${_unused}") + set(HUNTER_GATE_VERSION "${_unused}") + else() + get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE) + set(_done_location "${_archive_id_location}/DONE") + set(_sha1_location "${_archive_id_location}/SHA1") + + # Check Hunter already downloaded by HunterGate + if(NOT EXISTS "${_done_location}") + hunter_gate_download("${_archive_id_location}") + endif() + + if(NOT EXISTS "${_done_location}") + hunter_gate_internal_error("hunter_gate_download failed") + endif() + + if(NOT EXISTS "${_sha1_location}") + hunter_gate_internal_error("${_sha1_location} not found") + endif() + file(READ "${_sha1_location}" _sha1_value) + string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal) + if(NOT _is_equal) + hunter_gate_internal_error( + "Short SHA1 collision:" + " ${_sha1_value} (from ${_sha1_location})" + " ${HUNTER_GATE_SHA1} (HunterGate)" + ) + endif() + if(NOT EXISTS "${_master_location}") + hunter_gate_user_error( + "Master file not found:" + " ${_master_location}" + "try to update Hunter/HunterGate" + ) + endif() + endif() + include("${_master_location}") + set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) + endif() +endmacro() diff --git a/build/cmake/ThriftMacros.cmake b/build/cmake/ThriftMacros.cmake index f837f9482f4..48b0d45c34c 100644 --- a/build/cmake/ThriftMacros.cmake +++ b/build/cmake/ThriftMacros.cmake @@ -28,13 +28,8 @@ if(WITH_SHARED_LIB) set_target_properties(${name} PROPERTIES OUTPUT_NAME ${name} VERSION ${thrift_VERSION} - SOVERSION ${thrift_VERSION} ) - #set_target_properties(${name} PROPERTIES PUBLIC_HEADER "${thriftcpp_HEADERS}") - install(TARGETS ${name} - RUNTIME DESTINATION "${BIN_INSTALL_DIR}" - LIBRARY DESTINATION "${LIB_INSTALL_DIR}" - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" - PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}") + SOVERSION ${thrift_VERSION}) + list(APPEND thrift_lib_targets ${name}) endif() if(WITH_STATIC_LIB) @@ -42,12 +37,8 @@ if(WITH_STATIC_LIB) set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name}${STATIC_POSTFIX} VERSION ${thrift_VERSION} - SOVERSION ${thrift_VERSION} ) - install(TARGETS ${name}_static - RUNTIME DESTINATION "${BIN_INSTALL_DIR}" - LIBRARY DESTINATION "${LIB_INSTALL_DIR}" - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" - PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}") + SOVERSION ${thrift_VERSION}) + list(APPEND thrift_lib_targets ${name}_static) endif() endmacro(ADD_LIBRARY_THRIFT) @@ -56,11 +47,11 @@ endmacro(ADD_LIBRARY_THRIFT) macro(TARGET_INCLUDE_DIRECTORIES_THRIFT name) if(WITH_SHARED_LIB) - target_include_directories(${name} ${ARGN}) + target_include_directories(${name} PUBLIC ${ARGN}) endif() if(WITH_STATIC_LIB) - target_include_directories(${name}_static ${ARGN}) + target_include_directories(${name}_static PUBLIC ${ARGN}) endif() endmacro(TARGET_INCLUDE_DIRECTORIES_THRIFT) diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt index 02ed78c6488..2a5a321922d 100644 --- a/compiler/cpp/CMakeLists.txt +++ b/compiler/cpp/CMakeLists.txt @@ -19,7 +19,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h) +hunter_add_package(flex) find_package(FLEX REQUIRED) +hunter_add_package(bison) find_package(BISON REQUIRED) # Create flex and bison files and build the lib parse static library @@ -138,7 +140,7 @@ if(${WITH_PLUGIN}) src/thrift/plugin/plugin_output.cc src/thrift/plugin/plugin.cc ) - TARGET_INCLUDE_DIRECTORIES_THRIFT(thriftc PUBLIC ${Boost_INCLUDE_DIRS}) + TARGET_INCLUDE_DIRECTORIES_THRIFT(thriftc "") TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftc thrift PUBLIC) target_compile_definitions(thrift-compiler PUBLIC THRIFT_ENABLE_PLUGIN) LINK_AGAINST_THRIFT_LIBRARY(thrift-compiler thriftc) diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index d07b4008c3f..d45ab722c40 100755 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -17,7 +17,6 @@ # under the License. # -include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") include_directories(src) # SYSLIBS contains libraries that need to be linked to all lib targets @@ -90,9 +89,9 @@ else() ) endif() -# If OpenSSL is not found just ignore the OpenSSL stuff -find_package(OpenSSL) -if(OPENSSL_FOUND AND WITH_OPENSSL) +if(WITH_OPENSSL) + hunter_add_package(OpenSSL) + find_package(OpenSSL REQUIRED) list( APPEND thriftcpp_SOURCES src/thrift/transport/TSSLSocket.cpp src/thrift/transport/TSSLServerSocket.cpp @@ -169,20 +168,22 @@ else() endif() if(WITH_LIBEVENT) - find_package(Libevent REQUIRED) # Libevent comes with CMake support form upstream + hunter_add_package(Libevent) + find_package(Libevent CONFIG REQUIRED) # Libevent comes with CMake support form upstream include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) - TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} ${LIBEVENT_LIBRARIES}) + TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} Libevent::event_core Libevent::event_extra) TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftnb thrift) endif() if(WITH_ZLIB) - find_package(ZLIB REQUIRED) + hunter_add_package(ZLIB) + find_package(ZLIB CONFIG REQUIRED) include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) - TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ${ZLIB_LIBRARIES}) + TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ZLIB::zlib) TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftz thrift) endif() @@ -205,12 +206,87 @@ endif() add_definitions("-D__STDC_LIMIT_MACROS") -# Install the headers -install(DIRECTORY "src/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}" - FILES_MATCHING PATTERN "*.h" PATTERN "*.tcc") +# Installation (https://github.com/forexample/package-example) + +# Layout. This works for all platforms: +# * /lib/cmake/ +# * /lib/ +# * /include/ +set(config_install_dir "lib/cmake/${PROJECT_NAME}") + +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +# Configuration +set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +set(namespace "${PROJECT_NAME}::") + +# Include module with fuction 'write_basic_package_version_file' +include(CMakePackageConfigHelpers) + +# Configure 'ConfigVersion.cmake' +# Use: +# * PROJECT_VERSION +write_basic_package_version_file( + "${version_config}" COMPATIBILITY SameMajorVersion +) + +# Configure 'Config.cmake' +# Use variables: +# * TARGETS_EXPORT_NAME +# * PROJECT_NAME +configure_package_config_file( + "${PROJECT_SOURCE_DIR}/build/cmake/Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION "${config_install_dir}" +) + +# Targets: +# * /lib/libthrift.a +# * /lib/libthriftz.a +# * /lib/libthriftnb.a +# * header location after install: /include/thrift/thrift-config.h +# * headers can be included by C++ code `#include ` +install( + TARGETS ${thrift_lib_targets} + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + RUNTIME DESTINATION "bin" + INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" +) + +# Headers: +# * src/thrift/thrift-config.h -> /include/thrift/thrift-config.h +install( + DIRECTORY "src/thrift" + DESTINATION "${INCLUDE_INSTALL_DIR}" + FILES_MATCHING PATTERN "*.h" PATTERN "*.tcc" +) + # Copy config.h file -install(DIRECTORY "${CMAKE_BINARY_DIR}/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}" - FILES_MATCHING PATTERN "*.h") +install( + DIRECTORY "${CMAKE_BINARY_DIR}/thrift" + DESTINATION "${INCLUDE_INSTALL_DIR}" + FILES_MATCHING PATTERN "*.h" +) + +# Config +# * /lib/cmake/thrift/thriftConfig.cmake +# * /lib/cmake/thrift/thriftConfigVersion.cmake +install( + FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" +) + +# Config +# * /lib/cmake/thrift/thriftTargets.cmake +install( + EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" +) if(BUILD_TESTING) add_subdirectory(test) diff --git a/lib/cpp/src/thrift/qt/CMakeLists.txt b/lib/cpp/src/thrift/qt/CMakeLists.txt index 04a9a316e4e..6de33749d70 100644 --- a/lib/cpp/src/thrift/qt/CMakeLists.txt +++ b/lib/cpp/src/thrift/qt/CMakeLists.txt @@ -22,7 +22,9 @@ set( thriftcppqt5_SOURCES TQTcpServer.cpp ) set(CMAKE_AUTOMOC ON) -find_package(Qt5 REQUIRED COMPONENTS Core Network) +hunter_add_package(Qt) +find_package(Qt5Core CONFIG REQUIRED) +find_package(Qt5Network CONFIG REQUIRED) ADD_LIBRARY_THRIFT(thriftqt5 ${thriftcppqt5_SOURCES}) TARGET_LINK_LIBRARIES_THRIFT(thriftqt5 Qt5::Core Qt5::Network) TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftqt5 thrift) diff --git a/tutorial/cpp/CMakeLists.txt b/tutorial/cpp/CMakeLists.txt index 1feec2c35e2..11524d7aca4 100644 --- a/tutorial/cpp/CMakeLists.txt +++ b/tutorial/cpp/CMakeLists.txt @@ -17,8 +17,6 @@ # under the License. # -include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") - #Make sure gen-cpp files can be included include_directories("${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-cpp") From 792a7f6b918a7bf003d5e4fdfa85391a175e3aa8 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Wed, 27 Sep 2017 14:47:58 -0400 Subject: [PATCH 2/4] Fix CMake config. --- build/cmake/Config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/Config.cmake.in b/build/cmake/Config.cmake.in index fdecd42187a..c80a7f63ad5 100644 --- a/build/cmake/Config.cmake.in +++ b/build/cmake/Config.cmake.in @@ -5,4 +5,4 @@ find_dependency(ZLIB) find_dependency(Libevent) check_required_components("@PROJECT_NAME@") -include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") From 4d4a26b0fa080fc1598898d60d0500857e4465b6 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Wed, 27 Sep 2017 15:30:32 -0400 Subject: [PATCH 3/4] Fix Boost includes. --- build/cmake/DefineOptions.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake index c55730fc730..d53b9c10a4f 100644 --- a/build/cmake/DefineOptions.cmake +++ b/build/cmake/DefineOptions.cmake @@ -91,6 +91,9 @@ if(BUILD_CPP) if(boost_components) hunter_add_package(Boost COMPONENTS ${boost_components}) find_package(Boost CONFIG REQUIRED ${boost_components}) + else() + hunter_add_package(Boost) + find_package(Boost CONFIG REQUIRED) endif() elseif(BUILD_C_GLIB AND BUILD_TESTING) find_package(Boost 1.53 REQUIRED) From 36f48e7a883dddd73f1d5e67a96e7a4330c1bc97 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 10:43:23 -0400 Subject: [PATCH 4/4] Improve CMake config. --- build/cmake/Config.cmake.in | 15 ++++++++++++--- lib/cpp/CMakeLists.txt | 9 +++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/build/cmake/Config.cmake.in b/build/cmake/Config.cmake.in index c80a7f63ad5..3f4c5945c89 100644 --- a/build/cmake/Config.cmake.in +++ b/build/cmake/Config.cmake.in @@ -1,8 +1,17 @@ @PACKAGE_INIT@ -include(CMakeFindDependencyMacro) -find_dependency(ZLIB) -find_dependency(Libevent) +set(package_deps @package_deps@) +foreach(dep IN LISTS package_deps) + if(dep STREQUAL "OpenSSL") + find_package(OpenSSL REQUIRED) + else() + find_package(${dep} CONFIG REQUIRED) + endif() +endforeach() + +set(boost_components @boost_components@) +find_package(Boost CONFIG REQUIRED ${boost_components}) + check_required_components("@PROJECT_NAME@") include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index d45ab722c40..c29ebaf4396 100755 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -21,6 +21,8 @@ include_directories(src) # SYSLIBS contains libraries that need to be linked to all lib targets set(SYSLIBS "") +set(package_deps Boost) +set(boost_components) # Create the thrift C++ library set( thriftcpp_SOURCES @@ -96,8 +98,8 @@ if(WITH_OPENSSL) src/thrift/transport/TSSLSocket.cpp src/thrift/transport/TSSLServerSocket.cpp ) - include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") - list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + list(APPEND SYSLIBS OpenSSL::SSL OpenSSL::Crypto) + list(APPEND package_deps OpenSSL) endif() # WITH_*THREADS selects which threading library to use @@ -108,6 +110,7 @@ if(WITH_BOOSTTHREADS) src/thrift/concurrency/BoostMutex.cpp ) list(APPEND SYSLIBS "${Boost_LIBRARIES}") + list(APPEND boost_components thread) elseif(UNIX AND NOT WITH_STDTHREADS) if(ANDROID) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") @@ -175,6 +178,7 @@ if(WITH_LIBEVENT) ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} Libevent::event_core Libevent::event_extra) TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftnb thrift) + list(APPEND package_deps Libevent) endif() if(WITH_ZLIB) @@ -185,6 +189,7 @@ if(WITH_ZLIB) ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ZLIB::zlib) TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftz thrift) + list(APPEND package_deps ZLIB) endif() if(WITH_QT4)