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

Fixed precompiled headers build on Linux

Browse Source
This commit is contained in:
Andrey Kamaev 2012-06-08 16:04:14 +00:00
parent 47a4e87784
commit ffa44fb114
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVPCHSupport.cmake
View File

@ -24,10 +24,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF() ENDIF()
SET(_PCH_include_prefix "-I") SET(_PCH_include_prefix "-I")
SET(_PCH_isystem_prefix "-isystem")
ELSEIF(WIN32) ELSEIF(WIN32)
SET(PCHSupport_FOUND TRUE) # for experimental msvc support SET(PCHSupport_FOUND TRUE) # for experimental msvc support
SET(_PCH_include_prefix "/I") SET(_PCH_include_prefix "/I")
SET(_PCH_isystem_prefix "/I")
ELSE() ELSE()
SET(PCHSupport_FOUND FALSE) SET(PCHSupport_FOUND FALSE)
ENDIF() ENDIF()
@ -50,7 +52,11 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES ) GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
FOREACH(item ${DIRINC}) FOREACH(item ${DIRINC})
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"") if(item MATCHES "^${OpenCV_SOURCE_DIR}/modules/")
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
else()
LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"")
endif()
ENDFOREACH(item) ENDFOREACH(item)
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)

3
modules/ts/include/opencv2/ts/ts.hpp
View File

@ -41,9 +41,6 @@
#ifndef GTEST_USES_POSIX_RE #ifndef GTEST_USES_POSIX_RE
# define GTEST_USES_POSIX_RE 0 # define GTEST_USES_POSIX_RE 0
#endif #endif
// #ifdef __GNUC__
// # pragma GCC diagnostic ignored "-Wmissing-declarations"
// #endif
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"