From 2621d9cb960a39ff8601d6a1b54763144b1e2a3b Mon Sep 17 00:00:00 2001 From: viferga Date: Thu, 9 Apr 2020 04:44:14 -0800 Subject: [PATCH] Add debug info for cs_loader_impl build and solve minor bug in dotnet find script. --- cmake/FindDotNET.cmake | 2 +- source/loaders/cs_loader/netcore/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/FindDotNET.cmake b/cmake/FindDotNET.cmake index 07faa3479..f9a6729a1 100644 --- a/cmake/FindDotNET.cmake +++ b/cmake/FindDotNET.cmake @@ -28,7 +28,7 @@ if(DOTNET_FOUND) endif() # Define dotnet command -option(DOTNET_COMMAND "Path of .NET Core command" dotnet) +set(DOTNET_COMMAND dotnet CACHE FILEPATH "Path of .NET Core command" FORCE) # Detect dotnet command execute_process(COMMAND ${DOTNET_COMMAND} diff --git a/source/loaders/cs_loader/netcore/CMakeLists.txt b/source/loaders/cs_loader/netcore/CMakeLists.txt index b82a9a9bb..2de64111e 100644 --- a/source/loaders/cs_loader/netcore/CMakeLists.txt +++ b/source/loaders/cs_loader/netcore/CMakeLists.txt @@ -40,6 +40,8 @@ if(OPTION_BUILD_GUIX) message(FATAL_ERROR ".NET Core support not implemented in Guix build for versions less than 2.0.") endif() + message(STATUS "Using DotNet source ${DOTNET_SOURCE} for Guix build.") + # Build without internet access add_custom_target(${target} ALL COMMAND ${DOTNET_COMMAND} restore --source ${DOTNET_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/source/project.csproj