Browse Source

Fix mac OS .net core test build

pull/348/head
Canming Huang 5 years ago
parent
commit
28997da619
  1. 18
      Emgu.CV.Test/CMakeLists.txt

18
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")

Loading…
Cancel
Save