added docs & apps

git-svn-id: https://code.ros.org/svn/opencv/trunk@1403 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index efd1f4ebae6ae1b6db06195f8f12b15d3b044f30..0fd2129aecf6ca2e5304b25eca8ea65780822a04 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -414,8 +414,8 @@ if(BUILD_EXAMPLES)
     add_subdirectory(samples)
 endif()
 
-#add_subdirectory(apps)
-#add_subdirectory(doc)
+add_subdirectory(apps)
+add_subdirectory(docs)
 
 if(BUILD_TESTS)
     enable_testing()

diff --git a/opencv/apps/CMakeLists.txt b/opencv/apps/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a59f909
--- /dev/null
+++ b/opencv/apps/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(haartraining)
\ No newline at end of file

diff --git a/opencv/apps/haartraining/CMakeLists.txt b/opencv/apps/haartraining/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8fc979a
--- /dev/null
+++ b/opencv/apps/haartraining/CMakeLists.txt
@@ -0,0 +1,63 @@
+project(haartraining)
+
+include_directories(src)
+include_directories(include)
+
+# -----------------------------------------------------------
+#  Library 
+# -----------------------------------------------------------
+set(cvhaartraining_lib_src
+    src/_cvcommon.h
+    src/cvclassifier.h    
+    src/_cvhaartraining.h
+    include/cvhaartraining.h
+    src/cvboost.cpp
+    src/cvcommon.cpp
+    src/cvhaarclassifier.cpp
+    src/cvhaartraining.cpp
+    src/cvsamples.cpp
+    )
+
+add_library(cvhaartraining STATIC ${cvhaartraining_lib_src})
+
+# -----------------------------------------------------------
+#  haartraining 
+# -----------------------------------------------------------
+
+add_executable(haartraining include/cvhaartraining.h src/haartraining.cpp)
+add_dependencies(haartraining cxcore cv cvhaartraining)
+target_link_libraries(haartraining cxcore cv cvhaartraining highgui)
+set_target_properties(haartraining PROPERTIES
+                      DEBUG_POSTFIX "d"
+                      OUTPUT_NAME "opencv-haartraining")
+
+# -----------------------------------------------------------
+#  createsamples 
+# -----------------------------------------------------------
+
+add_executable(createsamples include/cvhaartraining.h src/createsamples.cpp)
+add_dependencies(createsamples cxcore cv cvhaartraining)
+target_link_libraries(createsamples cxcore cv cvhaartraining highgui)
+set_target_properties(createsamples PROPERTIES
+                      DEBUG_POSTFIX "d"
+                      OUTPUT_NAME "opencv-createsamples")
+
+# -----------------------------------------------------------
+#  performance 
+# -----------------------------------------------------------
+add_executable(performance src/performance.cpp)
+add_dependencies(performance cxcore cv cvhaartraining)
+target_link_libraries(performance cxcore cv cvhaartraining highgui)
+set_target_properties(performance PROPERTIES
+                      DEBUG_POSTFIX "d"
+                      OUTPUT_NAME "opencv-performance")
+
+# -----------------------------------------------------------
+#  Install part
+# -----------------------------------------------------------
+
+install(TARGETS haartraining RUNTIME DESTINATION bin)
+install(TARGETS createsamples RUNTIME DESTINATION bin)
+install(TARGETS performance RUNTIME DESTINATION bin)
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/data/haarcascades DESTINATION ${CMAKE_INSTALL_PREFIX}/share/opencv/haarcascades)

diff --git a/opencv/doc/CMakeLists.txt b/opencv/doc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..254734f
--- /dev/null
+++ b/opencv/doc/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+#  CMake file for OpenCV docs
+#
+
+set(OPENCV_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/opencv/doc)
+
+file(GLOB_RECURSE FILES_DOC *.htm *.css *.txt *.jpg *.png *.pdf *.ps)
+
+install(FILES ${FILES_DOC} DESTINATION ${OPENCV_DOC_INSTALL_PATH})

diff --git a/opencv/include/CMakeLists.txt b/opencv/include/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a59f909
--- /dev/null
+++ b/opencv/include/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(haartraining)
\ No newline at end of file

diff --git a/opencv/src/CMakeLists.txt b/opencv/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a59f909
--- /dev/null
+++ b/opencv/src/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(haartraining)
\ No newline at end of file