Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix CMakeList, updated opencv path.

UWP10
Canming Huang 13 years ago
parent
1555e48e33
commit
c98ad8c1a9
5 changed files with 37 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      CMakeLists.txt
  2. 4
      Emgu.CV.Example/FaceDetection/CMakeLists.txt
  3. 4
      Emgu.CV.Example/FaceDetection/FaceDetection.csproj
  4. 2
      Emgu.CV.Example/FaceDetectionVB/FaceDetectionVB.vbproj
  5. 23
      tests/cvextern_test/CMakeLists.txt

40
CMakeLists.txt
View File

@ -23,7 +23,7 @@ INCLUDE (CheckTargetArch)
SET(LIBRARY_3RDPARTY_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/3rdParty)
# ----------------------------------------------------------------------------
# Autodetect if we are in a SVN repository
# Autodetect if we are in a GIT repository
# ----------------------------------------------------------------------------
FIND_PROGRAM(GIT_PATH git)
FIND_PROGRAM(WC_PATH wc)
@ -43,7 +43,7 @@ IF(GIT_PATH AND WC_PATH)
ENDIF()
MESSAGE(STATUS "Emgu CV GIT VERSION: ${EMGUCV_GITVERSION}")
ELSE()
# We don't have svnversion:
# We don't have git or wc:
SET(EMGUCV_GITVERSION "0")
ENDIF()
@ -318,7 +318,7 @@ IF (ANDROID)
PATTERN "*.xml"
PATTERN "*.resx"
PATTERN "CMakeLists.txt" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
)
ENDFOREACH()
@ -334,7 +334,7 @@ IF (ANDROID)
PATTERN "*.xml"
PATTERN "*.txt"
PATTERN "*.png"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
)
INSTALL(
FILES
@ -532,7 +532,7 @@ INSTALL(
PATTERN "*.dll"
PATTERN "*.txt"
PATTERN "*.xml"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "CMake*" EXCLUDE
PATTERN "Release" EXCLUDE
@ -549,7 +549,7 @@ INSTALL(
FILES_MATCHING
PATTERN "Emgu.CV.sln"
PATTERN "Emgu.CV.DebuggerVisualizers.sln"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "bin" EXCLUDE
)
@ -560,7 +560,7 @@ INSTALL(
COMPONENT emgucv_source
FILES_MATCHING
PATTERN "*.cs"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
)
# ----------------------------------------------------------------------------
@ -594,7 +594,7 @@ INSTALL(
PATTERN "*.settings"
PATTERN "*.config"
PATTERN "tessdata/*"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "CMake*" EXCLUDE
PATTERN "Release" EXCLUDE
@ -610,15 +610,15 @@ INSTALL(
COMPONENT emgucv_example_source
FILES_MATCHING
PATTERN "Emgu.CV.Example.sln"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "bin" EXCLUDE
)
INSTALL(
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/opencv/data/haarcascades/haarcascade_frontalface_default.xml"
"${CMAKE_CURRENT_SOURCE_DIR}/opencv/data/haarcascades/haarcascade_eye.xml"
DESTINATION ./opencv/data/haarcascades
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_frontalface_default.xml"
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_eye.xml"
DESTINATION opencv_attic/opencv/data/haarcascades
COMPONENT emgucv_example_source
)
@ -739,7 +739,7 @@ INSTALL(
PATTERN "*.dll"
PATTERN "*.txt"
PATTERN "*.xml"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "CMake*" EXCLUDE
PATTERN "Release" EXCLUDE
@ -756,7 +756,7 @@ INSTALL(
FILES_MATCHING
PATTERN "Emgu.CV.sln"
PATTERN "Emgu.CV.DebuggerVisualizers.sln"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "bin" EXCLUDE
)
@ -767,7 +767,7 @@ INSTALL(
COMPONENT emgucv_source
FILES_MATCHING
PATTERN "*.cs"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
)
# ----------------------------------------------------------------------------
@ -801,7 +801,7 @@ INSTALL(
PATTERN "*.settings"
PATTERN "*.config"
PATTERN "tessdata/*"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "obj" EXCLUDE
PATTERN "CMake*" EXCLUDE
PATTERN "Release" EXCLUDE
@ -817,15 +817,15 @@ INSTALL(
COMPONENT emgucv_example_source
FILES_MATCHING
PATTERN "Emgu.CV.Example.sln"
PATTERN ".svn" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "bin" EXCLUDE
)
INSTALL(
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/opencv/data/haarcascades/haarcascade_frontalface_default.xml"
"${CMAKE_CURRENT_SOURCE_DIR}/opencv/data/haarcascades/haarcascade_eye.xml"
DESTINATION ./opencv/data/haarcascades
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_frontalface_default.xml"
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_eye.xml"
DESTINATION opencv_attic/opencv/data/haarcascades
COMPONENT emgucv_example_source
)

4
Emgu.CV.Example/FaceDetection/CMakeLists.txt
View File

@ -18,8 +18,8 @@ LIST(APPEND CS_FLAGS ${EMGU_CV_GPU_REFERENCE})
#copy the test image for this example
SET(EXAMPLE_FACE_DETECTION_DATA_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/lena.jpg"
"${CMAKE_CURRENT_SOURCE_DIR}/../../opencv/data/haarcascades/haarcascade_eye.xml"
"${CMAKE_CURRENT_SOURCE_DIR}/../../opencv/data/haarcascades/haarcascade_frontalface_default.xml")
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_eye.xml"
"${OPENCV_SUBFOLDER}/data/haarcascades/haarcascade_frontalface_default.xml")
FOREACH(EXAMPLE_FACE_DETECTION_DATA_FILE ${EXAMPLE_FACE_DETECTION_DATA_FILES})
ADD_CS_FILE_TO_DEPLOY(${EXAMPLE_FACE_DETECTION_DATA_FILE})

4
Emgu.CV.Example/FaceDetection/FaceDetection.csproj
View File

@ -68,10 +68,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\opencv\data\haarcascades\haarcascade_eye.xml">
<Content Include="..\..\opencv_attic\opencv\data\haarcascades\haarcascade_eye.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\opencv\data\haarcascades\haarcascade_frontalface_default.xml">
<Content Include="..\..\opencv_attic\opencv\data\haarcascades\haarcascade_frontalface_default.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="lena.jpg">

2
Emgu.CV.Example/FaceDetectionVB/FaceDetectionVB.vbproj
View File

@ -111,7 +111,7 @@
</None>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\opencv\data\haarcascades\haarcascade_frontalface_default.xml">
<Content Include="..\..\opencv_attic\opencv\data\haarcascades\haarcascade_frontalface_default.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="lena.jpg">

23
tests/cvextern_test/CMakeLists.txt
View File

@ -6,17 +6,18 @@
project(cvextern_test)
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/core/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/imgproc/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/video/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/ml/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/calib3d/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/objdetect/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/features2d/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/legacy/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/contrib/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/modules/flann/include")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../opencv/include/opencv")
SET(OPENCV_MODULES_DIR "${OPENCV_SUBFOLDER}/modules")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/core/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/imgproc/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/video/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/ml/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/calib3d/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/objdetect/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/features2d/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/legacy/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/contrib/include")
INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/flann/include")
INCLUDE_DIRECTORIES("${OPENCV_SUBFOLDER}/include/opencv")
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/../../Emgu.CV.Extern/")
#INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})

Write Preview
Loading…
Cancel
Save