From 91d1e50b3624a6481d93b31cfea1b21c6301c7f2 Mon Sep 17 00:00:00 2001 From: Gabor Buella Date: Sat, 7 May 2022 21:12:01 +0200 Subject: [PATCH] Fix path argument supplied to tar in boost.cmake Unpacking a downloaded Boost package was not possible, due to supplying erroneous argument to the tar command. Before: cd directory; tar xfj directory/boost.tar.bz2 After: cd directory; tar xfj boost.tar.bz2 --- cmake/boost.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/boost.cmake b/cmake/boost.cmake index 70d67b78ffd2..ee219c2519d6 100644 --- a/cmake/boost.cmake +++ b/cmake/boost.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2014, 2021, Oracle and/or its affiliates. +# Copyright (c) 2014, 2022, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -239,10 +239,11 @@ ENDIF() IF(LOCAL_BOOST_ZIP AND NOT LOCAL_BOOST_DIR) GET_FILENAME_COMPONENT(LOCAL_BOOST_DIR ${LOCAL_BOOST_ZIP} PATH) + GET_FILENAME_COMPONENT(LOCAL_BOOST_ZIP_NAME ${LOCAL_BOOST_ZIP} NAME) IF(NOT EXISTS "${LOCAL_BOOST_DIR}/${BOOST_PACKAGE_NAME}") - MESSAGE(STATUS "cd ${LOCAL_BOOST_DIR}; tar xfj ${LOCAL_BOOST_ZIP}") + MESSAGE(STATUS "cd ${LOCAL_BOOST_DIR}; tar xfj ${LOCAL_BOOST_ZIP_NAME}") EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -E tar xfj "${LOCAL_BOOST_ZIP}" + COMMAND ${CMAKE_COMMAND} -E tar xfj "${LOCAL_BOOST_ZIP_NAME}" WORKING_DIRECTORY "${LOCAL_BOOST_DIR}" RESULT_VARIABLE tar_result )