From 6dd26137831fe0c70680c0cfb5b4052887a2159d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 11:29:26 +0100 Subject: [PATCH 01/10] Started to hunterize inja --- CMakeLists.txt | 99 +++++++- cmake/Config.cmake.in | 4 + cmake/HunterGate.cmake | 540 +++++++++++++++++++++++++++++++++++++++++ test/CMakeLists.txt | 54 ++++- 4 files changed, 676 insertions(+), 21 deletions(-) create mode 100644 cmake/Config.cmake.in create mode 100644 cmake/HunterGate.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 645e0db..1d411c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,23 +1,34 @@ cmake_minimum_required(VERSION 3.1) -## -## PROJECT -## name and version -## -project(inja) - ## ## OPTIONS ## option(BUILD_UNIT_TESTS "Build the unit tests" ON) +## +## HUNTER +## +option(HUNTER_ENABLED "Use hunter to manage dependencies" OFF) +include("cmake/HunterGate.cmake") +HunterGate( + URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" + SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" +) + +## +## PROJECT +## name and version +## +project(inja LANGUAGES CXX VERSION 0.1.1) +set(INJA_VERSION ${PROJECT_VERSION}) + ## ## CONFIGURATION ## set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --coverage") -set(INJA_SOURCE_DIR src/) -set(INJA_HEADER_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist) +set(INJA_SOURCE_DIR src) +set(INJA_HEADER_INSTALL_DIR include) ## ## TESTS @@ -28,11 +39,77 @@ if(BUILD_UNIT_TESTS) add_subdirectory(test) endif() +## +## TARGETS +## Build targets for the interface library +## +add_library(inja INTERFACE) +target_include_directories(inja INTERFACE + $ + $ +) +if(HUNTER_ENABLED) # Use Hunter to manage dependencies + # Add JSON package + hunter_add_package(nlohmann_json) + find_package(nlohmann_json CONFIG REQUIRED) + # Add dependencies to target + target_link_libraries(inja INTERFACE nlohmann_json) +else() + #target_include_directories(inja INTERFACE + # $ + # $ + #) +endif() + ## ## INSTALL ## install header files, generate and install cmake config files for find_package() ## -install( - DIRECTORY ${INJA_SOURCE_DIR} - DESTINATION ${INJA_HEADER_INSTALL_DIR} +set(include_install_dir ${INJA_HEADER_INSTALL_DIR}) +set(config_install_dir "lib/cmake/${PROJECT_NAME}") +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") +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(CMakePackageConfigHelpers) + +# Use: +# * PROJECT_VERSION +write_basic_package_version_file( + "${version_config}" COMPATIBILITY SameMajorVersion ) + +# Use: +# * TARGETS_EXPORT_NAME +# * PROJECT_NAME +configure_package_config_file( + "cmake/Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION "${config_install_dir}" +) + +install( + TARGETS inja + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + RUNTIME DESTINATION "bin" + INCLUDES DESTINATION "${include_install_dir}" +) + +install( + FILES ${INJA_SOURCE_DIR}/inja.hpp + DESTINATION "${include_install_dir}" +) + +install( + FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" +) + +install( + EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" +) \ No newline at end of file diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in new file mode 100644 index 0000000..53a0679 --- /dev/null +++ b/cmake/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/cmake/HunterGate.cmake b/cmake/HunterGate.cmake new file mode 100644 index 0000000..3a8043d --- /dev/null +++ b/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/test/CMakeLists.txt b/test/CMakeLists.txt index a3c341a..e855450 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,21 +1,55 @@ -## -## Prepare "Catch" library for other executables -## -set(CATCH_INCLUDE_DIR "thirdparty/catch") -add_library(Catch INTERFACE) -target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}) +cmake_minimum_required(VERSION 3.1) +## +## HUNTER +## +option(HUNTER_ENABLED "Use hunter to manage dependencies" OFF) +include("../cmake/HunterGate.cmake") +HunterGate( + URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" + SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" +) + +## +## PROJECT +## name and version +## +project(inja-testing LANGUAGES CXX VERSION ${INJA_VERSION}) + +## +## TARGETS +## set(UNITTEST_TARGET_NAME "inja_unit") file(GLOB TEST_SOURCES "src/*.cpp") add_executable(${UNITTEST_TARGET_NAME} ${TEST_SOURCES}) -target_link_libraries(${UNITTEST_TARGET_NAME} Catch) -target_include_directories(${UNITTEST_TARGET_NAME} PRIVATE "../src" "thirdparty/json") +## +## INCLUDES +## +if(HUNTER_ENABLED) # Use Hunter to manage dependencies + # Add Catch framework + hunter_add_package(Catch) + find_package(Catch CONFIG REQUIRED) + # Add JSON package + hunter_add_package(nlohmann_json) + find_package(nlohmann_json CONFIG REQUIRED) + # Add dependencies to target + target_link_libraries(${UNITTEST_TARGET_NAME} Catch::Catch) + target_link_libraries(${UNITTEST_TARGET_NAME} nlohmann_json) +else() # Manage dependencies manually + # Prepare "Catch" library for other executables + set(CATCH_INCLUDE_DIR "thirdparty/catch") + add_library(Catch INTERFACE) + target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}) + # Add dependencies to target + target_link_libraries(${UNITTEST_TARGET_NAME} Catch) + target_include_directories(${UNITTEST_TARGET_NAME} PRIVATE "../src" "thirdparty/json") +endif() ## ## Add tests to make ## add_test(NAME "${UNITTEST_TARGET_NAME}_default" - COMMAND ${UNITTEST_TARGET_NAME} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build + COMMAND ${UNITTEST_TARGET_NAME} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build ) From cea75e7f6a76178a9bb1bccb4dd439a3276d3872 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 13:23:37 +0100 Subject: [PATCH 02/10] Conditionally include hunter gate --- CMakeLists.txt | 20 +++++++++++--------- test/CMakeLists.txt | 12 +++++++----- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d411c5..973dd39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,11 +9,13 @@ option(BUILD_UNIT_TESTS "Build the unit tests" ON) ## HUNTER ## option(HUNTER_ENABLED "Use hunter to manage dependencies" OFF) -include("cmake/HunterGate.cmake") -HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" - SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" -) +if(HUNTER_ENABLED) + include("cmake/HunterGate.cmake") + HunterGate( + URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" + SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" + ) +endif() ## ## PROJECT @@ -55,10 +57,10 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies # Add dependencies to target target_link_libraries(inja INTERFACE nlohmann_json) else() - #target_include_directories(inja INTERFACE - # $ - # $ - #) + target_include_directories(inja INTERFACE + $ + $ + ) endif() ## diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e0fe60c..3fd6afc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,11 +4,13 @@ cmake_minimum_required(VERSION 3.1) ## HUNTER ## option(HUNTER_ENABLED "Use hunter to manage dependencies" OFF) -include("../cmake/HunterGate.cmake") -HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" - SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" -) +if(HUNTER_ENABLED) + include("../cmake/HunterGate.cmake") + HunterGate( + URL "https://github.com/ruslo/hunter/archive/v0.19.156.tar.gz" + SHA1 "8d5e4635b137365e0d1ade4d60accf4e2bb41f0d" + ) +endif() ## ## PROJECT From b4ba3881ffd95ebeaafa21119ffb5e8925c0d4df Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 13:26:42 +0100 Subject: [PATCH 03/10] Added 'hunter' to version number --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 973dd39..11c2cf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ endif() ## PROJECT ## name and version ## -project(inja LANGUAGES CXX VERSION 0.1.1) +project(inja LANGUAGES CXX VERSION 0.1-hunter) set(INJA_VERSION ${PROJECT_VERSION}) ## From 16523ba92c49d9763eda768a46359094b6cfc275 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 13:51:01 +0100 Subject: [PATCH 04/10] invalid version string --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11c2cf2..5a338af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ endif() ## PROJECT ## name and version ## -project(inja LANGUAGES CXX VERSION 0.1-hunter) +project(inja LANGUAGES CXX VERSION 0.1) set(INJA_VERSION ${PROJECT_VERSION}) ## From 45f5acae7d9a1ba776c9419a5ec2b960461658ad Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 14:44:13 +0100 Subject: [PATCH 05/10] Disable the interface library linking --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a338af..b46cfe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ endif() ## Build targets for the interface library ## add_library(inja INTERFACE) -target_include_directories(inja INTERFACE +target_include_directories(inja INTERFACE $ $ ) @@ -55,9 +55,9 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies hunter_add_package(nlohmann_json) find_package(nlohmann_json CONFIG REQUIRED) # Add dependencies to target - target_link_libraries(inja INTERFACE nlohmann_json) + target_link_libraries(inja nlohmann_json) else() - target_include_directories(inja INTERFACE + target_include_directories(inja INTERFACE $ $ ) From 61811ee1d248abc10511c6992bf2f1b353fa3898 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 14:54:32 +0100 Subject: [PATCH 06/10] Bring it back --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b46cfe9..e8e0722 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies hunter_add_package(nlohmann_json) find_package(nlohmann_json CONFIG REQUIRED) # Add dependencies to target - target_link_libraries(inja nlohmann_json) + target_link_libraries(inja INTERFACE nlohmann_json) else() target_include_directories(inja INTERFACE $ From 966f8f70f8018df67c86224abf007a97b93b0103 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 23:09:48 +0100 Subject: [PATCH 07/10] Moved json headers to appropriately named directory --- test/thirdparty/{json => nlohmann}/LICENSE.MIT | 0 test/thirdparty/{json => nlohmann}/json.hpp | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/thirdparty/{json => nlohmann}/LICENSE.MIT (100%) rename test/thirdparty/{json => nlohmann}/json.hpp (100%) diff --git a/test/thirdparty/json/LICENSE.MIT b/test/thirdparty/nlohmann/LICENSE.MIT similarity index 100% rename from test/thirdparty/json/LICENSE.MIT rename to test/thirdparty/nlohmann/LICENSE.MIT diff --git a/test/thirdparty/json/json.hpp b/test/thirdparty/nlohmann/json.hpp similarity index 100% rename from test/thirdparty/json/json.hpp rename to test/thirdparty/nlohmann/json.hpp From ffcc0229eebe2866041d93473e426bc94afe1972 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 23:10:12 +0100 Subject: [PATCH 08/10] Include json headers with rpefix --- test/src/unit-files.cpp | 2 +- test/src/unit-parser.cpp | 2 +- test/src/unit-renderer.cpp | 2 +- test/src/unit-string-helper.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/src/unit-files.cpp b/test/src/unit-files.cpp index 0929f34..7fc6d65 100644 --- a/test/src/unit-files.cpp +++ b/test/src/unit-files.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "json.hpp" +#include "nlohmann/json.hpp" #include "inja.hpp" diff --git a/test/src/unit-parser.cpp b/test/src/unit-parser.cpp index 5bb5b50..9794b91 100644 --- a/test/src/unit-parser.cpp +++ b/test/src/unit-parser.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "json.hpp" +#include "nlohmann/json.hpp" #include "inja.hpp" diff --git a/test/src/unit-renderer.cpp b/test/src/unit-renderer.cpp index f6b2d3a..0ab7ff5 100644 --- a/test/src/unit-renderer.cpp +++ b/test/src/unit-renderer.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "json.hpp" +#include "nlohmann/json.hpp" #include "inja.hpp" diff --git a/test/src/unit-string-helper.cpp b/test/src/unit-string-helper.cpp index eff0001..8436997 100644 --- a/test/src/unit-string-helper.cpp +++ b/test/src/unit-string-helper.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "json.hpp" +#include "nlohmann/json.hpp" #include "inja.hpp" From e12bb7bcfe6c847bee4693a4ac83aadfcced9ca4 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 23:11:53 +0100 Subject: [PATCH 09/10] Add dependencies and include directories --- CMakeLists.txt | 2 +- cmake/Config.cmake.in | 3 +++ test/CMakeLists.txt | 10 +++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8e0722..1fad3ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies target_link_libraries(inja INTERFACE nlohmann_json) else() target_include_directories(inja INTERFACE - $ + $ $ ) endif() diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 53a0679..b091192 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -1,4 +1,7 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(nlohmann_json CONFIG REQUIRED) + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3fd6afc..9f18bbf 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -38,14 +38,18 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies # Add dependencies to target target_link_libraries(${UNITTEST_TARGET_NAME} Catch::Catch) target_link_libraries(${UNITTEST_TARGET_NAME} nlohmann_json) + target_link_libraries(${UNITTEST_TARGET_NAME} inja) else() # Manage dependencies manually # Prepare "Catch" library for other executables - set(CATCH_INCLUDE_DIR "thirdparty/catch") add_library(Catch INTERFACE) - target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}) + target_include_directories(Catch INTERFACE "thirdparty/catch") + # Prepare "JSON" library for other executables + add_library(JSON INTERFACE) + target_include_directories(JSON INTERFACE "thirdparty") # Add dependencies to target target_link_libraries(${UNITTEST_TARGET_NAME} Catch) - target_include_directories(${UNITTEST_TARGET_NAME} PRIVATE "../src" "thirdparty/json") + target_link_libraries(${UNITTEST_TARGET_NAME} JSON) + target_link_libraries(${UNITTEST_TARGET_NAME} inja) endif() ## From a5f7f9d0f8ca4b1ad0d09483a8a8b44adc51f58f Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Thu, 16 Nov 2017 00:01:20 +0100 Subject: [PATCH 10/10] Added a message for MSCV < 2015 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fad3ef..af5a353 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --coverage") set(INJA_SOURCE_DIR src) set(INJA_HEADER_INSTALL_DIR include) +if(WIN32 AND MSVC AND MSVC_VERSION LESS 1900) + message(FATAL_ERROR "[${PROJECT_NAME}] Visual Studio versions prior to 2015 do not support the noexcept keyword, which is used in the JSON library.") +endif() + ## ## TESTS ## create and configure the unit test target