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

Fixed output paths for some libraries and executables.

Browse Source 
Added option to force disable precompiled headers.
This commit is contained in:
Andrey Kamaev
2011-04-30 10:42:33 +00:00
parent c122b7e114
commit 41f5e8e3d8
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCVModule.cmake
View File

@@ -46,7 +46,7 @@ macro(define_opencv_module name)
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
)
if(PCHSupport_FOUND)
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.hpp)
if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
if(${CMAKE_GENERATOR} MATCHES "Visual*")
@@ -110,7 +110,7 @@ macro(define_opencv_module name)
add_executable(${the_target} ${test_srcs} ${test_hdrs})
if(PCHSupport_FOUND)
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
set(pch_header ${CMAKE_CURRENT_SOURCE_DIR}/test/test_precomp.hpp)
if(${CMAKE_GENERATOR} MATCHES "Visual*" OR ${CMAKE_GENERATOR} MATCHES "Xcode*")
if(${CMAKE_GENERATOR} MATCHES "Visual*")