Browse Source

Fix osx build

pull/168/head
Canming Huang 7 years ago
parent
commit
b6f09e0183
  1. 1
      Emgu.CV.Extern/cvblob/CMakeLists.txt
  2. 0
      Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86/opencv_ffmpeg400.dll.meta
  3. 0
      Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86_64/opencv_ffmpeg400_64.dll.meta
  4. 1
      tests/cvextern_test/CMakeLists.txt

1
Emgu.CV.Extern/cvblob/CMakeLists.txt

@ -74,6 +74,7 @@ set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${the_target}"
)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 11)
IF(DEFINED EMGUCV_PLATFORM_TOOLSET)
set_target_properties(${the_target} PROPERTIES PLATFORM_TOOLSET ${EMGUCV_PLATFORM_TOOLSET})
ENDIF()

0
Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86/opencv_ffmpeg341.dll.meta → Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86/opencv_ffmpeg400.dll.meta

0
Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86_64/opencv_ffmpeg341_64.dll.meta → Emgu.CV.Unity/Assets/Emgu.CV/Plugins/x86_64/opencv_ffmpeg400_64.dll.meta

1
tests/cvextern_test/CMakeLists.txt

@ -90,6 +90,7 @@ set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${the_target}"
)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 11)
if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "emgu")
endif()

Loading…
Cancel
Save