From 56cb3b1e84f81c33df5e618d8fa5a110fd8634c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80?= <148970641+Egor00f@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:18:18 +0000 Subject: [PATCH] fix CURRNET (fix build) --- .vscode/settings.json | 1 + CMakeLists.txt | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b0b7111..b5ed4a7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,4 +14,5 @@ ".vscode-insiders", "package/DEBIAN" ], + "cmake.parallelJobs": 1 } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c930464..a319fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,25 +16,25 @@ add_custom_target( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Download libraries" BYPRODUCTS - ${CMAKE_CURRNET_BINARY_DIR}/lib - ${CMAKE_CURRNET_BINARY_DIR}/sdk-28-10-16.7z + ${CMAKE_CURRENT_BINARY_DIR}/lib + ${CMAKE_CURRENT_BINARY_DIR}/sdk-28-10-16.7z ) add_custom_target( archive_libraries - COMMAND 7z a lib.7z ${CMAKE_CURRNET_BINARY_DIR}/lib - WORKING_DIRECTORY ${CMAKE_CURRNET_BINARY_DIR} + COMMAND 7z a ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/lib + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} BYPRODUCTS - ${CMAKE_CURRNET_BINARY_DIR}/lib.7z + ${CMAKE_CURRENT_BINARY_DIR}/lib.7z DEPENDS - ${CMAKE_CURRNET_BINARY_DIR}/lib + ${CMAKE_CURRENT_BINARY_DIR}/lib ) add_custom_target( download_linux COMMAND wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/x86_64-linux-kos32-5.4.0.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z COMMAND wget http://board.kolibrios.org/download/file.php?id=8301libisl.so.10.2.2.7z -q -O ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${c} COMMENT "Download linux toolchain" BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z @@ -53,7 +53,7 @@ add_custom_target( add_custom_target( extract_linux COMMENT "Extract linux archives" - COMMAND 7z x ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z + COMMAND 7z x -y ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2 @@ -81,7 +81,6 @@ add_custom_target( COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2 ${CMAKE_CURRENT_BINARY_DIR}/package/usr/lib/x86_64-linux-gnu/libisl.so.10.2.2 COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools COMMAND cp -f ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools - COMMAND cp -f ${CMAKE_CURRNET_BINARY_DIR}/lib.7z ${CMAKE_CURRENT_BINARY_DIR}/package/home/autobuild/tools COMMAND dpkg-deb --build ${CMAKE_CURRENT_BINARY_DIR}/package ${CMAKE_CURRENT_BINARY_DIR}/package.deb WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Build deb offline package" @@ -90,7 +89,7 @@ add_custom_target( DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libisl.so.10.2.2.7z ${CMAKE_CURRENT_BINARY_DIR}/kos32-toolchain-linux.7z - ${CMAKE_CURRNET_BINARY_DIR}/lib.7z + ${CMAKE_CURRENT_BINARY_DIR}/lib.7z ) add_custom_target(