Browse Source

Fixed the signing of Emgu.CV.Platform.Android & Emgu.CV.Models.

pull/703/head
Canming Huang 4 years ago
parent
commit
6f35075b54
  1. 6
      Emgu.CV.Models/Emgu.CV.Models.NetStandard/CMakeLists.txt
  2. 6
      Emgu.CV.Platform/Android/CMakeLists.txt

6
Emgu.CV.Models/Emgu.CV.Models.NetStandard/CMakeLists.txt

@ -13,13 +13,13 @@ IF(EMGU_CV_BUILD OR EMGU_CV_EXAMPLE_BUILD)
BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/CrossPlatform/Emgu.CV.sln" "Emgu.CV.Models.NetStandard" "${EXTRA_BUILD_FLAGS}" ALL)
IF (EMGU_SIGN_FOUND)
EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Emgu.CV.Models.dll)
EMGU_SIGN_BINARY(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/Emgu.CV.Models.dll)
ENDIF()
INSTALL(
FILES
${LIBRARY_OUTPUT_PATH}/Emgu.CV.Models.xml
${LIBRARY_OUTPUT_PATH}/Emgu.CV.Models.dll
${CMAKE_CURRENT_SOURCE_DIR}/../../libs/Emgu.CV.Models.xml
${CMAKE_CURRENT_SOURCE_DIR}/../../libs/Emgu.CV.Models.dll
DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
COMPONENT emgucv_binary)

6
Emgu.CV.Platform/Android/CMakeLists.txt

@ -19,7 +19,7 @@ IF(HAVE_ANDROID)
SET(EXTRA_BUILD_FLAGS "/p:Platform=\"Any CPU\"")
MSBUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../../Solution/Android/Emgu.CV.Android.sln" "${PROJECT_NAME}" "${EXTRA_BUILD_FLAGS}" ALL)
IF (EMGU_SIGN_FOUND)
EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.dll)
EMGU_SIGN_BINARY(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/${PROJECT_NAME}.dll)
ENDIF()
#ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME}
# PRE_BUILD
@ -31,8 +31,8 @@ IF(HAVE_ANDROID)
ADD_DEPENDENCIES(${PROJECT_NAME} cvextern Emgu.CV.Platform.NetStandard)
INSTALL(
FILES
${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.xml
${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.dll
${CMAKE_CURRENT_SOURCE_DIR}/../../libs/${PROJECT_NAME}.xml
${CMAKE_CURRENT_SOURCE_DIR}/../../libs/${PROJECT_NAME}.dll
DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
COMPONENT emgucv_binary)
ENDIF()

Loading…
Cancel
Save