From 395788c311359147005edca3f5d6b7706911b91d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Jan 2021 17:04:17 +0100 Subject: [PATCH] :hammer: fix dependency --- cmake/ci.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/ci.cmake b/cmake/ci.cmake index 105186b12..36aaa9952 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -474,25 +474,25 @@ add_custom_target(ci_benchmarks ############################################################################### if (APPLE) + set(CMAKE_310_BINARY ${PROJECT_BINARY_DIR}/cmake-3.1.0-Darwin64/CMake.app/Contents/bin/cmake) add_custom_command( - OUTPUT cmake-3.1.0 + OUTPUT ${CMAKE_310_BINARY} COMMAND wget https://github.com/Kitware/CMake/releases/download/v3.1.0/cmake-3.1.0-Darwin64.tar.gz COMMAND tar xfz cmake-3.1.0-Darwin64.tar.gz COMMAND rm cmake-3.1.0-Darwin64.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMENT "Download CMake 3.1.0" ) - set(CMAKE_310_BINARY ${PROJECT_BINARY_DIR}/cmake-3.1.0-Darwin64/CMake.app/Contents/bin/cmake) else() + set(CMAKE_310_BINARY ${PROJECT_BINARY_DIR}/cmake-3.1.0-Linux-x86_64/bin/cmake) add_custom_command( - OUTPUT cmake-3.1.0 + OUTPUT ${CMAKE_310_BINARY} COMMAND wget https://github.com/Kitware/CMake/releases/download/v3.1.0/cmake-3.1.0-Linux-x86_64.tar.gz COMMAND tar xfz cmake-3.1.0-Linux-x86_64.tar.gz COMMAND rm cmake-3.1.0-Linux-x86_64.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMENT "Download CMake 3.1.0" ) - set(CMAKE_310_BINARY ${PROJECT_BINARY_DIR}/cmake-3.1.0-Linux-x86_64/bin/cmake) endif() set(JSON_CMAKE_FLAGS "JSON_BuildTests;JSON_Install;JSON_MultipleHeaders;JSON_Sanitizer;JSON_Valgrind;JSON_NoExceptions;JSON_Coverage") @@ -507,7 +507,7 @@ foreach(JSON_CMAKE_FLAG ${JSON_CMAKE_FLAGS}) COMMENT "Check CMake flag ${JSON_CMAKE_FLAG} (CMake 3.1)" COMMAND mkdir ${PROJECT_BINARY_DIR}/build_${JSON_CMAKE_FLAG_TARGET}_31 COMMAND cd ${PROJECT_BINARY_DIR}/build_${JSON_CMAKE_FLAG_TARGET}_31 && ${CMAKE_310_BINARY} -Werror=dev ${PROJECT_SOURCE_DIR} -D${JSON_CMAKE_FLAG}=ON -DCMAKE_CXX_COMPILE_FEATURES="cxx_range_for" -DCMAKE_CXX_FLAGS="-std=gnu++11" - DEPENDS cmake-3.1.0 + DEPENDS ${CMAKE_310_BINARY} ) list(APPEND JSON_CMAKE_FLAG_TARGETS ${JSON_CMAKE_FLAG_TARGET} ${JSON_CMAKE_FLAG_TARGET}_31) list(APPEND JSON_CMAKE_FLAG_BUILD_DIRS ${PROJECT_BINARY_DIR}/build_${JSON_CMAKE_FLAG_TARGET} ${PROJECT_BINARY_DIR}/build_${JSON_CMAKE_FLAG_TARGET}_31)