# ----------------------------------------------------------------------------
-# CMake file for libjasper. See root CMakeLists.txt
+# CMake file for libjasper. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
project(libjasper)
# List of C++ files:
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ "${CMAKE_CURRENT_SOURCE_DIR}/../include"
)
# The .cpp files:
add_definitions(-DJAS_WIN_MSVC_BUILD)
endif()
-set_target_properties(${the_target}
- PROPERTIES
+set_target_properties(${the_target}
+ PROPERTIES
OUTPUT_NAME "${the_target}"
DEBUG_POSTFIX "d"
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
)
-
-#install(TARGETS ${the_target}
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib
-# ARCHIVE DESTINATION lib
-# )
# ----------------------------------------------------------------------------
-# CMake file for libjpeg. See root CMakeLists.txt
+# CMake file for libjpeg. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
project(libjpeg)
# List of C++ files:
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ "${CMAKE_CURRENT_SOURCE_DIR}/../include"
)
# The .cpp files:
if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
- add_definitions(-DJAS_WIN_MSVC_BUILD)
endif()
-set_target_properties(${the_target}
- PROPERTIES OUTPUT_NAME "${the_target}"
+set_target_properties(${the_target}
+ PROPERTIES OUTPUT_NAME "${the_target}"
DEBUG_POSTFIX "d"
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdparty/lib
)
-
-#install(TARGETS ${the_target}
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib
-# ARCHIVE DESTINATION lib
-# )
# ----------------------------------------------------------------------------
-# CMake file for libpng. See root CMakeLists.txt
+# CMake file for libpng. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
project(libpng)
# List of C++ files:
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../include"
)
file(GLOB lib_srcs *.c)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
endif()
-set_target_properties(${the_target}
- PROPERTIES OUTPUT_NAME "${the_target}"
+set_target_properties(${the_target}
+ PROPERTIES OUTPUT_NAME "${the_target}"
DEBUG_POSTFIX "d"
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
)
-
-#INSTALL(TARGETS ${the_target}
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib
-# ARCHIVE DESTINATION lib
-# )
# ----------------------------------------------------------------------------
-# CMake file for libtiff. See root CMakeLists.txt
+# CMake file for libtiff. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
project(libtiff)
# List of C++ files:
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../include"
)
# The .cpp files:
if(APPLE)
set(lib_srcs ${lib_srcs} tif_apple.c)
endif(APPLE)
-
+
file(GLOB lib_hdrs *.h*)
set(the_target "libtiff")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
endif()
-set_target_properties(${the_target}
- PROPERTIES
- OUTPUT_NAME "${the_target}"
+set_target_properties(${the_target}
+ PROPERTIES
+ OUTPUT_NAME "${the_target}"
DEBUG_POSTFIX "d"
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib/"
)
-
-#install(TARGETS ${the_target}
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib
-# ARCHIVE DESTINATION lib
-# )
# ----------------------------------------------------------------------------
-# CMake file for zlib. See root CMakeLists.txt
+# CMake file for zlib. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
PROJECT(zlib)
# List of C++ files:
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../include"
)
file(GLOB lib_srcs *.c)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
endif()
-set_target_properties(${the_target}
- PROPERTIES
- OUTPUT_NAME "${the_target}"
+set_target_properties(${the_target}
+ PROPERTIES
+ OUTPUT_NAME "${the_target}"
DEBUG_POSTFIX "d"
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
)
-
-#install(TARGETS ${the_target}
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib
-# ARCHIVE DESTINATION lib
-# )
#
# From the off-tree build directory, invoke:
# $ cmake <PATH_TO_OPENCV_ROOT>
-#
+#
#
# - OCT-2008: Initial version <joseluisblancoc@gmail.com>
#
if(UNIX)
include(FindPkgConfig OPTIONAL)
include(CheckFunctionExists)
- include(CheckIncludeFile)
+ include(CheckIncludeFile)
endif()
if(CMAKE_COMPILER_IS_GNUCXX)
# ===================================================
# Macros that checks if module have been installed.
-# After it adds module to build and define
+# After it adds module to build and define
# constants passed as second arg
# ===================================================
set(ALIAS_LIBRARIES ${ALIAS}_LIBRARIES)
PKG_CHECK_MODULES(${ALIAS} ${module_name})
-
+
if (${ALIAS_FOUND})
set(${define} 1)
foreach(P "${ALIAS_INCLUDE_DIRS}")
CHECK_MODULE(libdc1394 HAVE_DC1394)
- CHECK_MODULE(libxine HAVE_XINE)
-
- CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
- CHECK_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)
- CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
- CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
- CHECK_FUNCTION_EXISTS(alloca HAVE_ALLOCA)
-
if(NOT APPLE)
+ CHECK_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)
+ CHECK_FUNCTION_EXISTS(alloca HAVE_ALLOCA)
+ CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
+ CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
+
CHECK_MODULE(libxine HAVE_XINE)
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
include(FindJasper)
set(OPENCV_LINKER_LIBS dl m pthread)
- endif()
+ else()
+ add_definitions(-DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_LIBPTHREAD -DHAVE_UNISTD_H)
+ endif()
endif()
set(BUILD_PYTHON_SUPPORT OFF CACHE BOOL "Build with Python support")
# ===================================================
if(PYTHONLIBS_FOUND AND BUILD_PYTHON_SUPPORT)
execute_process(COMMAND ${PYTHON_EXECUTABLE} --version
- ERROR_VARIABLE PYTHON_VERSION_FULL
+ ERROR_VARIABLE PYTHON_VERSION_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
endif()
-# ---------------------------------------------------------------
-# "Classic" function & headers detection:
-# ---------------------------------------------------------------
-if(UNIX)
- if(NOT APPLE)
- CHECK_FUNCTION_EXISTS(alloca HAVE_ALLOCA)
- CHECK_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)
- CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
- CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
- else()
- add_definitions(-DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_LIBPTHREAD -DHAVE_UNISTD_H)
- endif()
-endif()
-
# ----------------------------------------------------------------------------
# UPDATE CONFIG FILES & SCRIPTS:
#
# ---------------------------------------------------------------------------
# The C+//0 include & link directories:
# ---------------------------------------------------------------------------
-include_directories(".")
-include_directories("${OPENCV_CONFIG_FILE_INCLUDE_DIR}")
-include_directories("${CMAKE_SOURCE_DIR}/cv/include")
-include_directories("${CMAKE_SOURCE_DIR}/cv/src")
-include_directories("${CMAKE_SOURCE_DIR}/cvaux/include")
-include_directories("${CMAKE_SOURCE_DIR}/cxcore/include")
-include_directories("${CMAKE_SOURCE_DIR}/ml/include")
-include_directories("${CMAKE_SOURCE_DIR}/otherlibs/highgui")
+include_directories("."
+ "${OPENCV_CONFIG_FILE_INCLUDE_DIR}"
+ "${CMAKE_SOURCE_DIR}/include"
+ "${CMAKE_SOURCE_DIR}/include/opencv"
+ )
# ----------------------------------------------------------------------------
# Set the maximum level of warnings:
endif()
if(CMAKE_COMPILER_IS_GNUCXX)
- # High level of warnings.
+ # High level of warnings.
# The -Wno-long-long is required in 64bit systems when including sytem headers.
set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall")
# Remove unreferenced functions: function level linking
if(NOT APPLE)
set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections")
- endif()
+ endif()
endif()
# Parallel mode
set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG")
set(EXTRA_C_FLAGS_DEBUG "${EXTRA_C_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")
-
+
if(OPENCV_USE_SSE2)
set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -msse2")
endif()
#-----------------------------------
# Subdirectories:
#-----------------------------------
-add_subdirectory(cxcore)
-add_subdirectory(cv)
-add_subdirectory(cvaux)
-add_subdirectory(ml)
-add_subdirectory(otherlibs)
+add_subdirectory(src)
+add_subdirectory(apps)
+add_subdirectory(doc)
if(BUILD_EXAMPLES)
add_subdirectory(samples)
endif()
-add_subdirectory(apps)
-add_subdirectory(docs)
-
if(BUILD_TESTS)
enable_testing()
add_subdirectory(tests)
add_subdirectory(interfaces)
endif()
+if(WIN32)
+ add_subdirectory(3rdparty)
+endif()
+
# --------------------------------------------------------------------------------------------
# Installation for CMake Module: OpenCVConfig.cmake
# Part 1/2: ${BIN_DIR}/OpenCVConfig.cmake -> For use *without* "make install"
# Part 1/2: ${BIN_DIR}/OpenCVConfig.cmake -> For use *without* "make install"
# -------------------------------------------------------------------------------------------
-# Name of libraries is: libcv110.so, etc...
+# Name of libraries is: libcv110.so, etc...
# OPENCV_DLLVERSION must be set to "110", etc..
# Already done above.
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE)
list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${OPENCV_CONFIG_FILE_INCLUDE_DIR}")
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/cv/include")
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/cvaux/include")
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/cxcore/include")
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/ml/include")
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/otherlibs/highgui")
+list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/include")
+list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_SOURCE_DIR}/include/opencv")
set(CMAKE_LIB_DIRS_CONFIGCMAKE ${LIBRARY_OUTPUT_PATH})
# use the default c++ flags
AM_CXXFLAGS=@DEF_CXXFLAGS@
-# tell make where aclocal finds its files in Maintainer Mode
+# tell make where aclocal finds its files in Maintainer Mode
ACLOCAL_AMFLAGS = -I ./autotools/aclocal
## Any directories that you want built and installed should go here.
else
APPS_DIR =
endif
-SUBDIRS = cxcore cv cvaux ml otherlibs utils interfaces $(APPS_DIR) tests samples data docs
+SUBDIRS = src include utils interfaces $(APPS_DIR) tests samples data doc
# All the rest of the distributed files
#EXTRA_DIST = THANKS COPYING INSTALL README NEWS ChangeLog \
EXTRA_DIST = THANKS TODO \
opencv.spec opencv.spec.in opencv.pc.in opencv.pc \
- _make apps filters make_frameworks.sh
+ apps make_frameworks.sh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = opencv.pc
dist-hook:
rm -rf `find $(distdir) -name CVS`
- chmod u+x $(srcdir)/utils/unix2dos.py
- find $(distdir) -name *.dsw -exec $(srcdir)/utils/unix2dos.py {} \;
- find $(distdir) -name *.dsp -exec $(srcdir)/utils/unix2dos.py {} \;
+# chmod u+x $(srcdir)/utils/unix2dos.py
+# find $(distdir) -name *.dsw -exec $(srcdir)/utils/unix2dos.py {} \;
+# find $(distdir) -name *.dsp -exec $(srcdir)/utils/unix2dos.py {} \;
# Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz
# It currently creates a private framework (see Apple documentation) that
# cannot be placed to the /Library/Framework locations but is intended to get
# copied into application bundles.
-#
+#
# You should usually not invoke this target directly but use the shell script
# 'make_frameworks.sh' instead that will create the most sensible
# default installation (universal build).
-#
+#
# See: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/
-#
+#
FRAMEWORK_NAME = OpenCV
FRAMEWORK_VERSION = A
FRAMEWORK_XHEADERS = \
$(top_srcdir)/autotools/darwin/OpenCV.h \
- $(top_srcdir)/cxcore/include/cxcore.h \
- $(top_srcdir)/cxcore/include/cxerror.h \
- $(top_srcdir)/cxcore/include/cxtypes.h \
- $(top_srcdir)/cxcore/include/cxmisc.h \
- $(top_srcdir)/cxcore/include/cxcore.hpp \
- $(top_srcdir)/cxcore/include/cvver.h \
- $(top_srcdir)/cv/include/cv.h \
- $(top_srcdir)/cv/include/cvcompat.h \
- $(top_srcdir)/cv/include/cvtypes.h \
- $(top_srcdir)/cv/include/cv.hpp \
- $(top_srcdir)/cvaux/include/cvaux.h \
- $(top_srcdir)/cvaux/include/cvmat.hpp \
- $(top_srcdir)/cvaux/include/cvaux.hpp \
- $(top_srcdir)/cvaux/include/cvvidsurv.hpp \
- $(top_srcdir)/ml/include/ml.h \
- $(top_srcdir)/otherlibs/highgui/highgui.h
+ $(top_srcdir)/include/opencv/cxcore.h \
+ $(top_srcdir)/include/opencv/cxerror.h \
+ $(top_srcdir)/include/opencv/cxtypes.h \
+ $(top_srcdir)/include/opencv/cxmisc.h \
+ $(top_srcdir)/include/opencv/cxcore.hpp \
+ $(top_srcdir)/include/opencv/cvver.h \
+ $(top_srcdir)/include/opencv/cv.h \
+ $(top_srcdir)/include/opencv/cvcompat.h \
+ $(top_srcdir)/include/opencv/cvtypes.h \
+ $(top_srcdir)/include/opencv/cv.hpp \
+ $(top_srcdir)/include/opencv/cvaux.h \
+ $(top_srcdir)/include/opencv/cvmat.hpp \
+ $(top_srcdir)/include/opencv/cvaux.hpp \
+ $(top_srcdir)/include/opencv/cvvidsurv.hpp \
+ $(top_srcdir)/include/opencv/ml.h \
+ $(top_srcdir)/include/opencv/highgui.h
FRAMEWORK_OFILES = \
- $(top_builddir)/cxcore/src/.libs/lib_cxcore.a \
- $(top_builddir)/cv/src/.libs/lib_cv.a \
- $(top_builddir)/cvaux/src/.libs/lib_cvaux.a \
- $(top_builddir)/ml/src/.libs/lib_ml.a \
- $(top_builddir)/otherlibs/highgui/.libs/lib_highgui.a
+ $(top_builddir)/src/cxcore/.libs/lib_cxcore.a \
+ $(top_builddir)/src/cv/.libs/lib_cv.a \
+ $(top_builddir)/src/cvaux/.libs/lib_cvaux.a \
+ $(top_builddir)/src/ml/.libs/lib_ml.a \
+ $(top_builddir)/src/highgui/.libs/lib_highgui.a
FRAMEWORK_XLIBRARIES = -framework Carbon -framework QuickTime -framework QuartzCore
FRAMEWORK_DOCUMENTATION = \
- $(top_srcdir)/docs/license.txt \
- $(top_srcdir)/docs/index.htm \
- $(top_srcdir)/docs/faq.htm \
- $(top_srcdir)/docs/ref
+ $(top_srcdir)/doc/license.txt \
+ $(top_srcdir)/doc/index.htm \
+ $(top_srcdir)/doc/faq.htm \
+ $(top_srcdir)/doc/ref
FMWK_CC = g++ -dynamiclib -all_load -Wl,-single_module -Wl,-Y,100
project(haartraining)
-include_directories(src)
-include_directories(include)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
# -----------------------------------------------------------
-# Library
+# 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
+ _cvcommon.h
+ cvclassifier.h
+ _cvhaartraining.h
+ cvhaartraining.h
+ cvboost.cpp
+ cvcommon.cpp
+ cvhaarclassifier.cpp
+ cvhaartraining.cpp
+ cvsamples.cpp
)
add_library(cvhaartraining STATIC ${cvhaartraining_lib_src})
# -----------------------------------------------------------
-# haartraining
+# haartraining
# -----------------------------------------------------------
-add_executable(haartraining include/cvhaartraining.h src/haartraining.cpp)
+add_executable(haartraining cvhaartraining.h haartraining.cpp)
add_dependencies(haartraining cxcore cv cvhaartraining)
target_link_libraries(haartraining cxcore cv cvhaartraining highgui)
set_target_properties(haartraining PROPERTIES
OUTPUT_NAME "opencv-haartraining")
# -----------------------------------------------------------
-# createsamples
+# createsamples
# -----------------------------------------------------------
-add_executable(createsamples include/cvhaartraining.h src/createsamples.cpp)
+add_executable(createsamples cvhaartraining.h createsamples.cpp)
add_dependencies(createsamples cxcore cv cvhaartraining)
target_link_libraries(createsamples cxcore cv cvhaartraining highgui)
set_target_properties(createsamples PROPERTIES
OUTPUT_NAME "opencv-createsamples")
# -----------------------------------------------------------
-# performance
+# performance
# -----------------------------------------------------------
-add_executable(performance src/performance.cpp)
-add_dependencies(performance cxcore cv cvhaartraining)
+add_executable(performance performance.cpp)
+add_dependencies(performance cxcore cv highgui cvhaartraining)
target_link_libraries(performance cxcore cv cvhaartraining highgui)
set_target_properties(performance PROPERTIES
DEBUG_POSTFIX "d"
file(GLOB HAAR_CASCADES ${CMAKE_SOURCE_DIR}/data/haarcascades/*.xml)
-install(FILES ${HAAR_CASCADES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/opencv/haarcascades)
+if(UNIX)
+ install(FILES ${HAAR_CASCADES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/opencv/haarcascades)
+endif()
ALL_CV_LIBS = \
libcvhaartraining.a \
- $(top_builddir)/otherlibs/highgui/libhighgui.la \
- $(top_builddir)/cv/src/libcv.la \
- $(top_builddir)/cxcore/src/libcxcore.la
+ $(top_builddir)/src/highgui/libhighgui.la \
+ $(top_builddir)/src/cv/libcv.la \
+ $(top_builddir)/src/cxcore/libcxcore.la
libcvhaartraining_a_SOURCES = \
cvboost.cpp \
EXTRA_DIST =
-INCLUDES = \
- -I$(top_srcdir)/cxcore/include \
- -I$(top_srcdir)/cv/include \
- -I$(top_srcdir)/otherlibs/highgui \
- -I$(srcdir)/../include \
- -I.
+INCLUDES = -I$(top_srcdir)/include/opencv -I.
#CXX=@CXXOPENMP@
*-*-*)
;;
esac
- fi
+ fi
fi
AC_LANG_PROGRAM([[
#include <omp.h>
void f(int* a, int* b, int n) {
- int i;
+ int i;
#pragma parallel for
for(i = 0; i < n; i++)
a[i] += b[i];
# default to i686/pentiumpro -- people can override this
DEFAULT_CXXFLAGS="-g $DEFAULT_CXXFLAGS"
fi
- ;;
+ ;;
powerpc-*-*)
if test x"$ac_cv_c_compiler_gnu" = "xyes"; then
# default to G3 processors -- people can override this
$SWIG -c++ -octave conftest.i || AC_MSG_ERROR(SWIG doesn't support Octave modules)
AC_MSG_RESULT([yes])
rm -f conftest.*
-
+
# specify the flags for swig
AC_SUBST([SWIG_OCTAVE_OPT], "-octave")
AC_CONFIG_FILES([Makefile
opencv.pc
opencv.spec
-docs/Makefile
+doc/Makefile
data/Makefile
-cxcore/Makefile
-cxcore/include/Makefile
-cxcore/src/Makefile
-cv/Makefile
-cv/include/Makefile
-cv/src/Makefile
-cvaux/Makefile
-cvaux/include/Makefile
-cvaux/src/Makefile
-ml/Makefile
-ml/include/Makefile
-ml/src/Makefile
-otherlibs/Makefile
-otherlibs/highgui/Makefile
+include/Makefile
+src/Makefile
+src/cxcore/Makefile
+src/cv/Makefile
+src/cvaux/Makefile
+src/ml/Makefile
+src/highgui/Makefile
apps/Makefile
apps/haartraining/Makefile
-apps/haartraining/include/Makefile
-apps/haartraining/src/Makefile
interfaces/Makefile
interfaces/swig/Makefile
interfaces/swig/filtered/Makefile
# CMake file for OpenCV docs
#
-set(OPENCV_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/opencv/doc)
+set(OPENCV_DOC_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/opencv/doc")
file(GLOB FILES_DOC *.htm *.txt *.jpg *.png *.pdf)
file(GLOB FILES_DOC_PAPERS papers/*.pdf papers/*.ps)
+file(GLOB FILES_DOC_VS vidsurv/*.doc)
file(GLOB FILES_DOC_REF ref/*.htm ref/*.css)
file(GLOB FILES_DOC_REF_PICS ref/pics/*.png ref/pics/*.jpg)
-install(FILES ${FILES_DOC} DESTINATION ${OPENCV_DOC_INSTALL_PATH})
-install(FILES ${CMAKE_SOURCE_DIR}/apps/haartraining/doc/haartraining.htm DESTINATION ${OPENCV_DOC_INSTALL_PATH})
-install(FILES ${FILES_DOC_PAPERS} DESTINATION ${OPENCV_DOC_INSTALL_PATH}/papers)
-install(FILES ${FILES_DOC_REF} DESTINATION ${OPENCV_DOC_INSTALL_PATH}/ref)
-install(FILES ${FILES_DOC_REF_PICS} DESTINATION ${OPENCV_DOC_INSTALL_PATH}/ref/pics)
+install(FILES ${FILES_DOC} DESTINATION "${OPENCV_DOC_INSTALL_PATH}")
+install(FILES ${FILES_DOC_PAPERS} DESTINATION "${OPENCV_DOC_INSTALL_PATH}/papers")
+install(FILES ${FILES_DOC_VS} DESTINATION "${OPENCV_DOC_INSTALL_PATH}/vidsurv")
+install(FILES ${FILES_DOC_REF} DESTINATION "${OPENCV_DOC_INSTALL_PATH}/ref")
+install(FILES ${FILES_DOC_REF_PICS} DESTINATION "${OPENCV_DOC_INSTALL_PATH}/ref/pics")
opencvdocdir = $(pkgdatadir)/doc
-nobase_dist_opencvdoc_DATA = cvcam.rtf faq.htm index.htm \
- license.txt opencv.jpg opencv-logo.png opencv-logo2.png opencvman_old.pdf \
+nobase_dist_opencvdoc_DATA = faq.htm index.htm \
+ license.txt opencv.jpg opencv-logo.png opencv-logo2.png \
../THANKS ../ChangeLog \
papers/algo_tracking.pdf papers/avbpa99.ps papers/camshift.pdf \
ref/opencvref.css ref/opencvref_cv.htm ref/opencvref_cvaux.htm \
ref/pics/minareabox.png ref/pics/mlp_.png ref/pics/neuron_model.png \
ref/pics/pointpolygon.png ref/pics/quadedge.png ref/pics/right.jpg \
ref/pics/sigmoid_bipolar.png ref/pics/subdiv.png ref/pics/threshold.png \
- python.txt python-wrappers-on-windows.txt
+ python.txt
-CV_INCLUDES = \
- -I$(top_srcdir)/cv/include \
- -I$(top_srcdir)/cxcore/include \
- -I$(top_srcdir)/ml/include \
- -I$(top_srcdir)/otherlibs/highgui \
- -I$(srcdir)
+CV_INCLUDES = -I$(top_srcdir)/include/opencv -I$(srcdir)
AM_CPPFLAGS = \
$(CV_INCLUDES) \
ml_wrap.cpp: ml.i octtypemaps.i \
$(top_srcdir)/interfaces/swig/general/typemaps.i \
$(top_srcdir)/interfaces/swig/general/memory.i \
- $(top_srcdir)/ml/include/ml.h \
+ $(top_srcdir)/include/opencv/ml.h \
Makefile.in
$(SWIG) $(SWIG_OCTAVE_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
$(top_srcdir)/interfaces/swig/general/highgui.i \
$(top_srcdir)/interfaces/swig/general/typemaps.i \
$(top_srcdir)/interfaces/swig/general/memory.i \
- $(top_srcdir)/otherlibs/highgui/highgui.h \
+ $(top_srcdir)/include/opencv/highgui.h \
Makefile.in
$(SWIG) $(SWIG_OCTAVE_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
MY_MKOCTFILE=$(CXX) -O0 -g -shared $(OCTAVE_INCFLAGS)
cv.oct: cv_wrap.cpp cvshadow.cpp octerror.cpp octhelpers.cpp
- $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/cv/src/.libs -lcv $^
+ $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/cv/.libs -lcv $^
ml.oct: ml_wrap.cpp octhelpers.cpp
- $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/ml/src/.libs -lml $^
+ $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/ml/.libs -lml $^
highgui.oct: highgui_wrap.cpp octhelpers.cpp
- $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/otherlibs/highgui/.libs -lhighgui $^
+ $(MY_MKOCTFILE) -o $@ $(AM_CPPFLAGS) -L$(top_builddir)/src/highgui/.libs -lhighgui $^
endif
)
set(opencv_headers
- ${CMAKE_SOURCE_DIR}/cxcore/include/cxtypes.h
- ${CMAKE_SOURCE_DIR}/cxcore/include/cxcore.h
- ${CMAKE_SOURCE_DIR}/cv/include/cvtypes.h
- ${CMAKE_SOURCE_DIR}/cv/include/cv.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/cxtypes.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/cxcore.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/cvtypes.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/cv.h
)
add_custom_command(
set(SWIG_MODULE_ml_EXTRA_DEPS
nointpb.i pytypemaps.i
../general/memory.i ../general/typemaps.i
- ${CMAKE_SOURCE_DIR}/ml/include/ml.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/ml.h
)
SWIG_ADD_MODULE(ml python ml.i pyhelpers.cpp pyhelpers.h)
nointpb.i pytypemaps.i
../general/highgui.i
../general/memory.i ../general/typemaps.i
- ${CMAKE_SOURCE_DIR}/otherlibs/highgui/highgui.h
+ ${CMAKE_SOURCE_DIR}/include/opencv/highgui.h
)
SWIG_ADD_MODULE(highgui python highgui.i pyhelpers.cpp pyhelpers.h)
# depending on the Automake conditionals set by configure, we will build the various
# script language interfaces that SWIG is capable of generating wrappers for
-CV_INCLUDES = \
- -I$(top_srcdir)/cv/include \
- -I$(top_srcdir)/cxcore/include \
- -I$(top_srcdir)/ml/include \
- -I$(top_srcdir)/otherlibs/highgui
+CV_INCLUDES = -I$(top_srcdir)/include/opencv -I$(srcdir)
AM_CPPFLAGS = \
$(CV_INCLUDES) \
_ml.cpp: ml.i nointpb.i pytypemaps.i \
$(top_srcdir)/interfaces/swig/general/typemaps.i \
$(top_srcdir)/interfaces/swig/general/memory.i \
- $(top_srcdir)/ml/include/ml.h \
+ $(top_srcdir)/include/opencv/ml.h \
Makefile.in
$(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
$(top_srcdir)/interfaces/swig/general/highgui.i \
$(top_srcdir)/interfaces/swig/general/typemaps.i \
$(top_srcdir)/interfaces/swig/general/memory.i \
- $(top_srcdir)/otherlibs/highgui/highgui.h \
+ $(top_srcdir)/include/opencv/highgui.h \
Makefile.in
$(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
CV_HEADER_FILES = \
- $(top_srcdir)/cxcore/include/cxtypes.h \
- $(top_srcdir)/cxcore/include/cxcore.h \
- $(top_srcdir)/cv/include/cvtypes.h \
- $(top_srcdir)/cv/include/cv.h
+ $(top_srcdir)/include/opencv/cxtypes.h \
+ $(top_srcdir)/include/opencv/cxcore.h \
+ $(top_srcdir)/include/opencv/cvtypes.h \
+ $(top_srcdir)/include/opencv/cv.h
cvaliases.i: $(CV_HEADER_FILES) Makefile.in
$(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
pycvseq.hpp cvshadow.cpp cvshadow.h \
cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
_cv_la_CXXFLAGS = $(PYTHON_CSPEC)
-_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
+_cv_la_LIBADD = $(top_builddir)/src/cv/libcv.la
_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-L$(SWIG_PYTHON_LIBS)
_ml_la_SOURCES = _ml.cpp pyhelpers.cpp pyhelpers.h
_ml_la_CXXFLAGS = $(PYTHON_CSPEC)
-_ml_la_LIBADD = $(top_builddir)/ml/src/libml.la
+_ml_la_LIBADD = $(top_builddir)/src/ml/libml.la
_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-L$(SWIG_PYTHON_LIBS)
_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
highgui.i
_highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
-_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
+_highgui_la_LIBADD = $(top_builddir)/src/highgui/libhighgui.la
_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-L$(SWIG_PYTHON_LIBS)
-add_subdirectory(haartraining)
\ No newline at end of file
+add_subdirectory(cxcore)
+add_subdirectory(cv)
+add_subdirectory(cvaux)
+add_subdirectory(ml)
+add_subdirectory(highgui)
# ----------------------------------------------------------------------------
-# CMake file for cv. See root CMakeLists.txt
+# CMake file for cv. See root CMakeLists.txt
# ----------------------------------------------------------------------------
project(cv)
-file(GLOB lib_srcs "src/*.cpp")
+file(GLOB lib_srcs "*.cpp")
source_group("Src" FILES ${lib_srcs})
-file(GLOB lib_hdrs "include/*.h*")
+
+set(lib_hdr_names cv.h cv.hpp cvcompat.h cvtypes.h)
+set(lib_hdrs)
+foreach(h ${lib_hdr_names})
+ list(APPEND lib_hdrs "${CMAKE_SOURCE_DIR}/include/opencv/${h}")
+endforeach()
source_group("Include\\External" FILES ${lib_hdrs})
-file(GLOB lib_int_hdrs "src/*.h*")
+
+file(GLOB lib_int_hdrs "*.h*")
source_group("Include\\Internal" FILES ${lib_int_hdrs})
if(WIN32 AND MSVC)
PROPERTIES
COMPILE_FLAGS "/Yu${pch_header}"
)
- endif()
+ endif()
endforeach()
list(REMOVE_ITEM lib_srcs ${dummy})
endif()
# use the default c++ flags
AM_CXXFLAGS=@DEF_CXXFLAGS@
-INCLUDES = -I. -I$(top_srcdir)/cv/include -I$(top_srcdir)/cxcore/include -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)/include/opencv -I$(top_srcdir)
noinst_HEADERS = _cv.h _cvgeom.h _cvimgproc.h _cvipp.h _cvlist.h _cvmatrix.h \
_cvkdtree.hpp
libcv_la_SOURCES = dummy.cpp
libcv_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
libcv_la_LIBADD = lib_cv.la \
- $(top_builddir)/cxcore/src/libcxcore.la \
+ $(top_builddir)/src/cxcore/libcxcore.la \
@LTLIBOBJS@
# ----------------------------------------------------------------------------
-# CMake file for cvaux. See root CMakeLists.txt
+# CMake file for cvaux. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
project(cvaux)
-# List of C++ files:
-set(lib_srcs "")
-set(lib_hdrs "")
-
-# The source files:
-file(GLOB aux_srcs src/*.cpp)
-file(GLOB aux_srcs_vs src/vs/*.cpp)
-set(lib_srcs ${lib_srcs} ${aux_srcs} ${aux_srcs_vs})
+file(GLOB aux_srcs *.cpp)
+file(GLOB aux_srcs_vs vs/*.cpp)
+set(lib_srcs ${aux_srcs_vs} ${aux_srcs})
source_group(Src FILES ${aux_srcs})
source_group(Src\\VideoSurveillance FILES ${aux_srcs_vs})
-# The corresponding .h files:
-file(GLOB_RECURSE aux_hdrs_ext include/*.h*)
-file(GLOB_RECURSE aux_hdrs_int src/*.h*)
+set(aux_hdr_names cvaux.h cvmat.hpp cvvidsurv.hpp)
+set(aux_hdrs_ext)
+foreach(h ${aux_hdr_names})
+ list(APPEND aux_hdrs_ext "${CMAKE_SOURCE_DIR}/include/opencv/${h}")
+endforeach()
+
+file(GLOB_RECURSE aux_hdrs_int *.h*)
set(lib_hdrs ${lib_hdrs} ${aux_hdrs_ext} ${aux_hdrs_int})
source_group("Include\\External" FILES ${aux_hdrs_ext})
source_group("Include\\Internal" FILES ${aux_hdrs_int})
-include_directories("${OPENCV_SOURCE_DIR}/cv/src")
-include_directories(src)
+include_directories("${CMAKE_SOURCE_DIR}/src/cv" ".")
if(WIN32 AND MSVC)
set(pch_header "_cvaux.h")
PROPERTIES
COMPILE_FLAGS "/Yu${pch_header}"
)
- endif()
+ endif()
endforeach()
list(REMOVE_ITEM lib_srcs ${dummy})
endif()
# use the default c++ flags
AM_CXXFLAGS=@DEF_CXXFLAGS@
-INCLUDES = -I. -I$(top_srcdir)/cvaux/include -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/cv/include -I$(top_srcdir)/cv/src -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)/include/opencv -I../cv -I$(top_srcdir)
noinst_HEADERS = _cvaux.h _cvfacedetection.h _cvvectrack.h _cvvm.h
noinst_LTLIBRARIES = lib_cvaux.la
libcvaux_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
libcvaux_la_LIBADD = \
lib_cvaux.la \
- $(top_builddir)/cxcore/src/libcxcore.la \
- $(top_builddir)/cv/src/libcv.la \
+ $(top_builddir)/src/cxcore/libcxcore.la \
+ $(top_builddir)/src/cv/libcv.la \
@LTLIBOBJS@
# ----------------------------------------------------------------------------
-# CMake file for cxcore. See root CMakeLists.txt
+# CMake file for cxcore. See root CMakeLists.txt
# ----------------------------------------------------------------------------
project(cxcore)
-file(GLOB lib_srcs "src/*.cpp")
+file(GLOB lib_srcs "*.cpp")
source_group("Src" FILES ${lib_srcs})
-file(GLOB lib_hdrs "include/*.h*")
+
+set(lib_hdr_names cxcore.h cxcore.hpp cxerror.h cxmisc.h cxtypes.h cvver.h cvwimage.h)
+set(lib_hdrs)
+foreach(h ${lib_hdr_names})
+ list(APPEND lib_hdrs "${CMAKE_SOURCE_DIR}/include/opencv/${h}")
+endforeach()
source_group("Include\\External" FILES ${lib_hdrs})
-file(GLOB lib_int_hdrs "src/*.h*")
+
+file(GLOB lib_int_hdrs "*.h*")
source_group("Include\\Internal" FILES ${lib_int_hdrs})
if(WIN32 AND MSVC)
ARCHIVE DESTINATION lib
)
+# install each module headers separately
if(UNIX)
install(FILES ${lib_hdrs} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/opencv")
endif()
-
# use the default c++ flags
AM_CXXFLAGS=@DEF_CXXFLAGS@
-INCLUDES = -I. -I$(top_srcdir)/cxcore/include -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)/include/opencv -I$(top_srcdir)
noinst_HEADERS = _cxcore.h _cxipp.h
noinst_LTLIBRARIES = lib_cxcore.la
# ----------------------------------------------------------------------------
-# CMake file for highgui. See root CMakeLists.txt
+# CMake file for highgui. See root CMakeLists.txt
# Some parts taken from version of Hartmut Seichter, HIT Lab NZ.
# Jose Luis Blanco, 2008
# ----------------------------------------------------------------------------
project(highgui)
-# List of C++ files:
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/cxcore/include
- ${CMAKE_SOURCE_DIR}/cv/include
- )
-
if(MSVC)
- include_directories(
- ${CMAKE_SOURCE_DIR}/otherlibs/_graphics/include
- )
-endif()
+ include_directories("${CMAKE_SOURCE_DIR}/3rdparty/include")
+endif()
-file(GLOB grfmt_hdrs grfmt*.h)
+file(GLOB grfmt_hdrs grfmt*.h)
file(GLOB grfmt_srcs grfmt*.cpp)
set(grfmt_hdrs bitstrm.h ${grfmt_hdrs})
set(grfmt_srcs bitstrm.cpp ${grfmt_srcs})
-
+
source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs})
-
+
set(highgui_srcs
cvcap.cpp
cvcap_images.cpp
)
set(highgui_hdrs _highgui.h utils.h)
-set(highgui_ext_hdrs highgui.h)
-
+set(highgui_ext_hdrs ${CMAKE_SOURCE_DIR}/include/opencv/highgui.h)
+
if(WIN32)
set(highgui_srcs ${highgui_srcs} window_w32.cpp cvcap_vfw.cpp cvcap_cmu.cpp cvcap_w32.cpp cvcap_dshow.cpp)
if(MSVC)
if(HAVE_MIL)
set(highgui_srcs ${highgui_srcs} cvcap_mil.cpp)
endif()
-endif()
+endif()
if(UNIX)
if(HAVE_GTK)
- set(highgui_srcs ${highgui_srcs} window_gtk.cpp)
+ set(highgui_srcs ${highgui_srcs} window_gtk.cpp)
endif()
if(HAVE_XINE)
add_definitions(-DHAVE_JASPER)
include_directories(${JASPER_INCLUDE_DIR})
endif()
- endif()
+ endif()
+
+ foreach(P ${HIGHGUI_INCLUDE_DIRS})
+ include_directories(${P})
+ endforeach()
+
+ foreach(P ${HIGHGUI_LIBRARY_DIRS})
+ link_directories(${P})
+ endforeach()
endif()
if(APPLE)
source_group("Include" FILES ${highgui_ext_hdrs})
if(MSVC)
- link_directories("${CMAKE_SOURCE_DIR}/otherlibs/_graphics/lib")
- link_directories("${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib")
- link_directories("${CMAKE_BINARY_DIR}/otherlibs/_graphics/lib/${ConfigurationName}")
-endif()
+ link_directories("${CMAKE_SOURCE_DIR}/3rdparty/lib"
+ "${CMAKE_BINARY_DIR}/3rdparty/lib"
+ "${CMAKE_BINARY_DIR}/3rdparty/lib/${ConfigurationName}"
+ )
+endif()
set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
PROPERTIES
COMPILE_FLAGS "/Yu${pch_header}"
)
- endif()
+ endif()
endforeach()
set(lib_srcs ${lib_srcs} precomp.cpp)
endif()
-if(UNIX)
- foreach(P ${HIGHGUI_INCLUDE_DIRS})
- include_directories(${P})
- endforeach()
-
- foreach(P ${HIGHGUI_LIBRARY_DIRS})
- link_directories(${P})
- endforeach()
-endif()
-
# ----------------------------------------------------------------------------------
# Define the library target:
# ----------------------------------------------------------------------------------
DEBUG_POSTFIX "d"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
- DEFINE_SYMBOL "CVAPI_EXPORTS"
+ DEFINE_SYMBOL "CVAPI_EXPORTS"
LINK_INTERFACE_LIBRARIES ""
)
if (MSVC)
target_link_libraries(${the_target} vfw32)
endif()
-
+
if(MINGW)
target_link_libraries(${the_target} vfw32 winmm)
endif()
)
if(UNIX)
- install(FILES highgui.h DESTINATION "${CMAKE_INSTALL_PREFIX}/include/opencv")
+ install(FILES ${highgui_ext_hdrs} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/opencv")
endif()
window_carbon.cpp window_gtk.cpp window_w32.cpp \
grfmt_imageio.cpp
-INCLUDES = -I. -I$(top_srcdir)/cxcore/include \
- -I$(top_srcdir)/cv/include @GTHREAD_CFLAGS@ @GTK_CFLAGS@ \
+INCLUDES = -I. -I$(top_srcdir)/include/opencv \
+ @GTHREAD_CFLAGS@ @GTK_CFLAGS@ \
@GSTREAMER_CFLAGS@ @QUICKTIME_CFLAGS@ @CARBON_CFLAGS@ \
@UNICAP_PACKAGE_CFLAGS@ @UCIL_PACKAGE_CFLAGS@
libhighgui_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
libhighgui_la_LIBADD = \
lib_highgui.la \
- $(top_builddir)/cxcore/src/libcxcore.la \
- $(top_builddir)/cv/src/libcv.la \
+ $(top_builddir)/src/cxcore/libcxcore.la \
+ $(top_builddir)/src/cv/libcv.la \
@GTHREAD_LIBS@ @GTK_LIBS@ @GSTREAMER_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ \
@IEEE1394LIBS@ @QUICKTIME_LIBS@ @CARBON_LIBS@ @XINE_LIBS@ @LTLIBOBJS@ \
@UNICAP_PACKAGE_LIBS@ @UCIL_PACKAGE_LIBS@
# ----------------------------------------------------------------------------
-# CMake file for ml. See root CMakeLists.txt
+# CMake file for ml. See root CMakeLists.txt
# ----------------------------------------------------------------------------
project(ml)
-file(GLOB lib_srcs "src/*.cpp")
+file(GLOB lib_srcs "*.cpp")
source_group("Src" FILES ${lib_srcs})
-file(GLOB lib_hdrs "include/*.h*")
+set(lib_hdrs ${CMAKE_SOURCE_DIR}/include/opencv/ml.h)
source_group("Include\\External" FILES ${lib_hdrs})
-file(GLOB lib_int_hdrs "src/*.h*")
+file(GLOB lib_int_hdrs "*.h*")
source_group("Include\\Internal" FILES ${lib_int_hdrs})
if(WIN32 AND MSVC)
- list(REMOVE_ITEM lib_srcs "src/dummy.cpp")
set(pch_header "_ml.h")
set(pch_src "ml.cpp")
foreach(src_file ${lib_srcs})
PROPERTIES
COMPILE_FLAGS "/Yu${pch_header}"
)
- endif()
+ endif()
endforeach()
list(REMOVE_ITEM lib_srcs ${dummy})
endif()
# use the default c++ flags
AM_CXXFLAGS=@DEF_CXXFLAGS@
-INCLUDES = -I. -I$(top_srcdir)/ml/include -I$(top_srcdir)/cxcore/include -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)/include/opencv -I$(top_srcdir)
noinst_HEADERS = _ml.h
noinst_LTLIBRARIES = lib_ml.la
lib_ml_la_SOURCES = \
ml.cpp mlann_mlp.cpp mlboost.cpp mlcnn.cpp mlem.cpp \
mlestimate.cpp mlknearest.cpp mlnbayes.cpp mlrtrees.cpp \
- mlsvm.cpp mltestset.cpp mltree.cpp ml_inner_functions.cpp
+ mlsvm.cpp mltestset.cpp mltree.cpp ml_inner_functions.cpp
lib_ml_la_LDFLAGS = -no-undefined @LDFLAGS@
# real library
libml_la_SOURCES = dummy.cpp
libml_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@ @LDFLAGS@
libml_la_LIBADD = lib_ml.la \
- $(top_builddir)/cxcore/src/libcxcore.la \
+ $(top_builddir)/src/cxcore/libcxcore.la \
@LTLIBOBJS@
INCLUDES = \
-I. \
-I$(top_srcdir)/tests/cxts \
- -I$(top_srcdir)/otherlibs/highgui \
- -I$(top_srcdir)/cxcore/include \
- -I$(top_srcdir)/cv/include \
- -I$(top_srcdir)/cvaux/include
+ -I$(top_srcdir)/include/opencv
check_PROGRAMS = cvtest
TESTS = $(check_PROGRAMS)
aoptflowlk.cpp aoptflowpyrlk.cpp aposit.cpp \
apyrsegmentation.cpp asnakes.cpp asubdivisions.cpp \
akdtree.cpp \
- atemplmatch.cpp athresh.cpp cvtest.cpp tsysa.cpp
+ atemplmatch.cpp athresh.cpp cvtest.cpp tsysa.cpp
cvtest_LDADD = \
$(top_builddir)/tests/cxts/libcxts.la \
- $(top_builddir)/cxcore/src/libcxcore.la \
- $(top_builddir)/cv/src/libcv.la \
- $(top_builddir)/cvaux/src/libcvaux.la \
- $(top_builddir)/otherlibs/highgui/libhighgui.la
+ $(top_builddir)/src/cxcore/libcxcore.la \
+ $(top_builddir)/src/cv/libcv.la \
+ $(top_builddir)/src/cvaux/libcvaux.la \
+ $(top_builddir)/src/highgui/libhighgui.la
EXTRA_DIST = precomp.cpp cxcoretest.dsp cxcoretest.vs2005.vcproj
-INCLUDES = \
- -I$(top_srcdir)/cxcore/include \
+INCLUDES = \
+ -I$(top_srcdir)/include/opencv \
-I$(top_srcdir)/tests/cxts
check_PROGRAMS = cxcoretest
TESTS = $(check_PROGRAMS)
-cxcoretest_SOURCES = \
+cxcoretest_SOURCES = \
cxcoretest.h \
aarithm.cpp \
adatastruct.cpp \
cxcoretest_main.cpp
cxcoretest_LDADD = \
$(top_builddir)/tests/cxts/libcxts.la \
- $(top_builddir)/cxcore/src/libcxcore.la
+ $(top_builddir)/src/cxcore/libcxcore.la
EXTRA_DIST = cxts.dsp cxts.vs2005.vcproj precomp.cpp
-INCLUDES = -I. -I$(top_srcdir)/cxcore/include -I$(top_srcdir)/tests
+INCLUDES = -I. -I$(top_srcdir)/include/opencv -I$(top_srcdir)/tests
AM_CFLAGS = @CFLAGS@ @DEBUG@
check_LTLIBRARIES = libcxts.la
libcxts_la_SOURCES = _cxts.h cxts.h cxts.cpp cxts_arrtest.cpp cxts_math.cpp
-libcxts_la_LIBADD = $(top_builddir)/cxcore/src/libcxcore.la
+libcxts_la_LIBADD = $(top_builddir)/src/cxcore/libcxcore.la
# 2008-04-19, xavier.delacour@gmail.com
-EXTRA_DIST =
+EXTRA_DIST =
MOSTLYCLEANFILES = *.works
TESTS_ENVIRONMENT = \
top_srcdir=$(top_srcdir) \
top_builddir=$(top_builddir) \
- LD_LIBRARY_PATH=$(top_builddir)/cxcore/src/.libs:$(top_builddir)/cv/src/.libs:$(top_builddir)/otherlibs/highgui/.libs:$(LD_LIBRARY_PATH) \
- DYLD_LIBRARY_PATH=$(top_builddir)/cxcore/src/.libs:$(top_builddir)/cv/src/.libs:$(top_builddir)/otherlibs/highgui/.libs:$(LD_LIBRARY_PATH) \
+ LD_LIBRARY_PATH=$(top_builddir)/src/cxcore/.libs:$(top_builddir)/src/cv/.libs:$(top_builddir)/src/highgui/.libs:$(LD_LIBRARY_PATH) \
+ DYLD_LIBRARY_PATH=$(top_builddir)/src/cxcore/.libs:$(top_builddir)/src/cv/.libs:$(top_builddir)/src/highgui/.libs:$(LD_LIBRARY_PATH) \
OCTAVEPATH=$(top_builddir)/interfaces/swig/octave
# do tests only if we ask for octave
TESTS_ENVIRONMENT = \
top_srcdir=$(top_srcdir) \
top_builddir=$(top_builddir) \
- LD_LIBRARY_PATH=$(top_builddir)/cxcore/src/.libs:$(top_builddir)/cv/src/.libs:$(top_builddir)/otherlibs/highgui/.libs:$(LD_LIBRARY_PATH) \
- DYLD_LIBRARY_PATH=$(top_builddir)/cxcore/src/.libs:$(top_builddir)/cv/src/.libs:$(top_builddir)/otherlibs/highgui/.libs:$(LD_LIBRARY_PATH) \
+ LD_LIBRARY_PATH=$(top_builddir)/src/cxcore/.libs:$(top_builddir)/src/cv/.libs:$(top_builddir)/src/highgui/.libs:$(LD_LIBRARY_PATH) \
+ DYLD_LIBRARY_PATH=$(top_builddir)/src/cxcore/.libs:$(top_builddir)/src/cv/.libs:$(top_builddir)/src/highgui/.libs:$(LD_LIBRARY_PATH) \
PYTHONPATH=$(top_srcdir)/interfaces/swig:$(top_builddir)/interfaces/swig/python/.libs
# do tests only if we ask for python
-EXTRA_DIST = \
- opencv.iss \
- cvinfo/cvinfo.cpp \
- cvinfo/cvinfo.dsp \
- cvinfo/cvinfo.vs2005.vcproj
+EXTRA_DIST = opencv.iss opencv.ico splash.bmp
noinst_PYTHON = \
check_doc.py \
- cvt_xml2xml.py \
- dos2unix.py \
extract_aliases.py \
extract_constants.py \
extract_doublepointers.py \
extract_macros.py \
- gen_make.py \
- make_index.py \
- search_leaks.py \
- unix2dos.py
-
-dist_noinst_SCRIPTS = \
- maintainer_clean.cmd
+ make_index.py
projects / opencv.git / commitdiff