From 28997da6199f52f100cb2c254886bbfc1c473854 Mon Sep 17 00:00:00 2001 From: Canming Huang Date: Thu, 23 Apr 2020 15:16:44 -0400 Subject: [PATCH] Fix mac OS .net core test build --- Emgu.CV.Test/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Emgu.CV.Test/CMakeLists.txt b/Emgu.CV.Test/CMakeLists.txt index b44de3179..ab1046744 100644 --- a/Emgu.CV.Test/CMakeLists.txt +++ b/Emgu.CV.Test/CMakeLists.txt @@ -6,16 +6,16 @@ IF(DOTNET_FOUND AND (NOT (IOS OR ANDROID))) PROJECT(Emgu.CV.Test.Netcore) -IF(APPLE) - BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../Solution/Windows.Desktop/Emgu.CV.Test.Netcore.sln" "" "" ALL) - ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} - PRE_BUILD - #COMMAND mono "${CMAKE_CURRENT_SOURCE_DIR}/../miscellaneous/nuget.exe" restore "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test.Netcore/Emgu.CV.Test.Netcore.csproj" - COMMAND ${MSBUILD_EXECUTABLE} -t:restore - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test.Netcore") -ELSE() +#IF(APPLE) +# BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../Solution/Windows.Desktop/Emgu.CV.Test.Netcore.sln" "" "" ALL) +# ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} +# PRE_BUILD +# #COMMAND mono "${CMAKE_CURRENT_SOURCE_DIR}/../miscellaneous/nuget.exe" restore "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test.Netcore/Emgu.CV.Test.Netcore.csproj" +# COMMAND ${MSBUILD_EXECUTABLE} -t:restore +# WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test.Netcore") +#ELSE() BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test.Netcore/Emgu.CV.Test.Netcore.csproj" "${EXTRA_BUILD_FLAGS}" ALL) -ENDIF() +#ENDIF() if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "emgu")