generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
This commit is contained in:
Roman Donchenko
2013-10-01 15:57:33 +04:00
parent ada858e1c0 e35bc11504
commit 81eb4bd8be
142 changed files with 7821 additions and 13967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/OpenCVPCHSupport.cmake
View File

@@ -25,11 +25,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
SET(_PCH_include_prefix "-I")
SET(_PCH_isystem_prefix "-isystem")
SET(_PCH_define_prefix "-D")
ELSEIF(CMAKE_GENERATOR MATCHES "^Visual.*$")
SET(PCHSupport_FOUND TRUE)
SET(_PCH_include_prefix "/I")
SET(_PCH_isystem_prefix "/I")
SET(_PCH_define_prefix "/D")
ELSE()
SET(PCHSupport_FOUND FALSE)
ENDIF()
@@ -244,6 +246,14 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
get_target_property(type ${_targetName} TYPE)
if(type STREQUAL "SHARED_LIBRARY")
get_target_property(__DEFINES ${_targetName} DEFINE_SYMBOL)
if(NOT __DEFINES MATCHES __DEFINES-NOTFOUND)
list(APPEND _compile_FLAGS "${_PCH_define_prefix}${__DEFINES}")
endif()
endif()
#MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
#message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")