Skip to content

Commit

Permalink
Make CS Loader implementation dependant of DOTNET_COMMAND.
Browse files Browse the repository at this point in the history
  • Loading branch information
viferga committed Apr 9, 2020
1 parent b4ab8c6 commit 3d7f2eb
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions source/loaders/cs_loader/netcore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ message(STATUS "Plugin ${target} implementation")

if(DOTNET_VERSION VERSION_EQUAL "2.0" OR DOTNET_VERSION VERSION_GREATER "2.0")
add_custom_target(${target} ALL
COMMAND dotnet restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.csproj
COMMAND dotnet publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.csproj -o ${CMAKE_BINARY_DIR}
COMMAND ${DOTNET_COMMAND} restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.csproj
COMMAND ${DOTNET_COMMAND} publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.csproj -o ${CMAKE_BINARY_DIR}
)
else()
if(DOTNET_MIGRATE)
add_custom_target(${target} ALL
COMMAND dotnet migrate ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND dotnet restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND dotnet publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json -o ${CMAKE_BINARY_DIR}
COMMAND ${DOTNET_COMMAND} migrate ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND ${DOTNET_COMMAND} restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND ${DOTNET_COMMAND} publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json -o ${CMAKE_BINARY_DIR}
)
else()
add_custom_target(${target} ALL
COMMAND dotnet restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND dotnet publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json -o ${CMAKE_BINARY_DIR}
COMMAND ${DOTNET_COMMAND} restore ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json
COMMAND ${DOTNET_COMMAND} publish ${CMAKE_CURRENT_SOURCE_DIR}/source/project.json -o ${CMAKE_BINARY_DIR}
)
endif()
endif()
Expand Down

0 comments on commit 3d7f2eb

Please sign in to comment.