Fixed precompiled headers support (fixed formatting, fixed dependencies generation)
This commit is contained in:
Andrey Kamaev
parent
221422467e
commit
3aea74d408
@ -1,3 +1,24 @@
|
|||||||
|
#opencv precompiled headers macro (can add pch to modules and tests)
|
||||||
|
#this macro must be called after any "add_definitions" commands, otherwise precompiled headers will not work
|
||||||
|
macro(add_opencv_precompiled_headers the_target)
|
||||||
|
if(the_target MATCHES opencv_test_)
|
||||||
|
SET(pch_name "test/test_precomp")
|
||||||
|
else()
|
||||||
|
SET(pch_name "src/precomp")
|
||||||
|
endif()
|
||||||
|
set(pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${pch_name}.hpp")
|
||||||
|
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS AND EXISTS "${pch_header}")
|
||||||
|
if(CMAKE_GENERATOR MATCHES Visual)
|
||||||
|
set(${the_target}_pch "${CMAKE_CURRENT_SOURCE_DIR}/${pch_name}.cpp")
|
||||||
|
add_native_precompiled_header(${the_target} ${pch_header})
|
||||||
|
elseif(CMAKE_GENERATOR MATCHES Xcode)
|
||||||
|
add_native_precompiled_header(${the_target} ${pch_header})
|
||||||
|
elseif(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_GENERATOR MATCHES Makefiles)
|
||||||
|
add_precompiled_header(${the_target} ${pch_header})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
# this is template for a OpenCV module
|
# this is template for a OpenCV module
|
||||||
macro(define_opencv_module name)
|
macro(define_opencv_module name)
|
||||||
|
|
||||||
@ -8,20 +29,19 @@ macro(define_opencv_module name)
|
|||||||
"${CMAKE_CURRENT_BINARY_DIR}")
|
"${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
|
|
||||||
foreach(d ${ARGN})
|
foreach(d ${ARGN})
|
||||||
if(${d} MATCHES "opencv_")
|
if(d MATCHES "opencv_")
|
||||||
if(${d} MATCHES "opencv_lapack")
|
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
||||||
else()
|
include_directories("${d_dir}/include")
|
||||||
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
|
||||||
include_directories("${d_dir}/include")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
file(GLOB lib_srcs "src/*.cpp")
|
file(GLOB lib_srcs "src/*.cpp")
|
||||||
file(GLOB lib_int_hdrs "src/*.h*")
|
file(GLOB lib_int_hdrs "src/*.h*")
|
||||||
|
|
||||||
if(COMMAND get_module_external_sources)
|
if(COMMAND get_module_external_sources)
|
||||||
get_module_external_sources(${name})
|
get_module_external_sources(${name})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
|
source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
|
||||||
|
|
||||||
file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")
|
file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")
|
||||||
@ -66,17 +86,7 @@ macro(define_opencv_module name)
|
|||||||
INSTALL_NAME_DIR lib
|
INSTALL_NAME_DIR lib
|
||||||
)
|
)
|
||||||
|
|
||||||
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
|
add_opencv_precompiled_headers(${the_target})
|
||||||
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*")
|
|
||||||
set(${the_target}_pch "src/precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add the required libraries for linking:
|
# Add the required libraries for linking:
|
||||||
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
|
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
|
||||||
@ -111,12 +121,9 @@ macro(define_opencv_module name)
|
|||||||
|
|
||||||
set(test_deps opencv_${name} ${ARGN} opencv_ts opencv_highgui ${EXTRA_${the_target}_DEPS})
|
set(test_deps opencv_${name} ${ARGN} opencv_ts opencv_highgui ${EXTRA_${the_target}_DEPS})
|
||||||
foreach(d ${test_deps})
|
foreach(d ${test_deps})
|
||||||
if(${d} MATCHES "opencv_")
|
if(d MATCHES "opencv_")
|
||||||
if(${d} MATCHES "opencv_lapack")
|
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
||||||
else()
|
include_directories("${d_dir}/include")
|
||||||
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
|
||||||
include_directories("${d_dir}/include")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
@ -130,17 +137,7 @@ macro(define_opencv_module name)
|
|||||||
|
|
||||||
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
||||||
|
|
||||||
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
|
add_opencv_precompiled_headers(${the_target})
|
||||||
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*")
|
|
||||||
set(${the_target}_pch "test/test_precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Additional target properties
|
# Additional target properties
|
||||||
set_target_properties(${the_target} PROPERTIES
|
set_target_properties(${the_target} PROPERTIES
|
||||||
|
|||||||
@ -15,234 +15,222 @@
|
|||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
||||||
EXEC_PROGRAM(
|
EXEC_PROGRAM(
|
||||||
${CMAKE_CXX_COMPILER}
|
${CMAKE_CXX_COMPILER}
|
||||||
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
|
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
|
||||||
OUTPUT_VARIABLE gcc_compiler_version)
|
OUTPUT_VARIABLE gcc_compiler_version)
|
||||||
#MESSAGE("GCC Version: ${gcc_compiler_version}")
|
#MESSAGE("GCC Version: ${gcc_compiler_version}")
|
||||||
IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9]")
|
IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9]")
|
||||||
SET(PCHSupport_FOUND TRUE)
|
SET(PCHSupport_FOUND TRUE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(_PCH_include_prefix "-I")
|
SET(_PCH_include_prefix "-I")
|
||||||
|
|
||||||
|
ELSEIF(WIN32)
|
||||||
|
SET(PCHSupport_FOUND TRUE) # for experimental msvc support
|
||||||
|
SET(_PCH_include_prefix "/I")
|
||||||
ELSE()
|
ELSE()
|
||||||
IF(WIN32)
|
SET(PCHSupport_FOUND FALSE)
|
||||||
SET(PCHSupport_FOUND TRUE) # for experimental msvc support
|
ENDIF()
|
||||||
SET(_PCH_include_prefix "/I")
|
|
||||||
ELSE()
|
|
||||||
SET(PCHSupport_FOUND FALSE)
|
|
||||||
ENDIF()
|
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
|
|
||||||
MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
|
MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
|
||||||
|
|
||||||
|
STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
|
||||||
|
SET(${_out_compile_flags} ${${_flags_var_name}} )
|
||||||
|
|
||||||
STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
SET(${_out_compile_flags} ${${_flags_var_name}} )
|
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
||||||
|
IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
|
||||||
|
LIST(APPEND ${_out_compile_flags} "-fPIC")
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
ELSE()
|
||||||
IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
|
## TODO ... ? or does it work out of the box
|
||||||
LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC")
|
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
ELSE()
|
GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
|
||||||
## TODO ... ? or does it work out of the box
|
FOREACH(item ${DIRINC})
|
||||||
ENDIF()
|
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
|
||||||
|
ENDFOREACH(item)
|
||||||
|
|
||||||
GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
|
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
|
||||||
FOREACH(item ${DIRINC})
|
GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${OpenCV_SOURCE_DIR} DEFINITIONS)
|
||||||
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
|
#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
|
||||||
ENDFOREACH(item)
|
LIST(APPEND ${_out_compile_flags} ${_directory_flags})
|
||||||
|
LIST(APPEND ${_out_compile_flags} ${_global_definitions})
|
||||||
|
LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS})
|
||||||
|
|
||||||
GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
|
SEPARATE_ARGUMENTS(${_out_compile_flags})
|
||||||
GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${OpenCV_SOURCE_DIR} DEFINITIONS)
|
|
||||||
#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
|
|
||||||
LIST(APPEND ${_out_compile_flags} ${_directory_flags})
|
|
||||||
LIST(APPEND ${_out_compile_flags} ${_global_definitions})
|
|
||||||
LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
|
|
||||||
|
|
||||||
SEPARATE_ARGUMENTS(${_out_compile_flags})
|
|
||||||
|
|
||||||
ENDMACRO(_PCH_GET_COMPILE_FLAGS)
|
ENDMACRO(_PCH_GET_COMPILE_FLAGS)
|
||||||
|
|
||||||
|
|
||||||
MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp)
|
MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp)
|
||||||
|
|
||||||
SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx)
|
SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx)
|
||||||
FILE(WRITE ${${_dephelp}}
|
ADD_CUSTOM_COMMAND(
|
||||||
"#include \"${_include_file}\"
|
OUTPUT "${${_dephelp}}"
|
||||||
int testfunction()
|
COMMAND ${CMAKE_COMMAND} -E echo "#include \\\"${_include_file}\\\"" > "${${_dephelp}}"
|
||||||
{
|
COMMAND ${CMAKE_COMMAND} -E echo "int testfunction()" >> "${${_dephelp}}"
|
||||||
return 0;
|
COMMAND ${CMAKE_COMMAND} -E echo "{" >> "${${_dephelp}}"
|
||||||
}
|
COMMAND ${CMAKE_COMMAND} -E echo " return 0;" >> "${${_dephelp}}"
|
||||||
"
|
COMMAND ${CMAKE_COMMAND} -E echo "}" >> "${${_dephelp}}"
|
||||||
)
|
DEPENDS "${_include_file}"
|
||||||
|
)
|
||||||
|
|
||||||
ENDMACRO(_PCH_WRITE_PCHDEP_CXX )
|
ENDMACRO(_PCH_WRITE_PCHDEP_CXX )
|
||||||
|
|
||||||
MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
|
MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
|
||||||
|
|
||||||
FILE(TO_NATIVE_PATH ${_input} _native_input)
|
FILE(TO_NATIVE_PATH ${_input} _native_input)
|
||||||
FILE(TO_NATIVE_PATH ${_output} _native_output)
|
FILE(TO_NATIVE_PATH ${_output} _native_output)
|
||||||
|
|
||||||
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
IF(CMAKE_CXX_COMPILER_ARG1)
|
||||||
IF(CMAKE_CXX_COMPILER_ARG1)
|
# remove leading space in compiler argument
|
||||||
# remove leading space in compiler argument
|
|
||||||
STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
|
STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
|
||||||
|
|
||||||
SET(${out_command}
|
SET(${out_command}
|
||||||
${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
||||||
)
|
)
|
||||||
ELSE(CMAKE_CXX_COMPILER_ARG1)
|
ELSE(CMAKE_CXX_COMPILER_ARG1)
|
||||||
SET(${out_command}
|
SET(${out_command}
|
||||||
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
|
||||||
)
|
)
|
||||||
ENDIF(CMAKE_CXX_COMPILER_ARG1)
|
ENDIF(CMAKE_CXX_COMPILER_ARG1)
|
||||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
||||||
SET(_dummy_str "#include <${_input}>")
|
SET(_dummy_str "#include <${_input}>")
|
||||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str})
|
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str})
|
||||||
|
|
||||||
SET(${out_command}
|
SET(${out_command}
|
||||||
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp
|
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp
|
||||||
)
|
)
|
||||||
#/out:${_output}
|
#/out:${_output}
|
||||||
|
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
||||||
ENDMACRO(_PCH_GET_COMPILE_COMMAND )
|
ENDMACRO(_PCH_GET_COMPILE_COMMAND )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn )
|
MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags _header_name _pch_path _dowarn )
|
||||||
|
|
||||||
FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path)
|
FILE(TO_NATIVE_PATH ${_pch_path} _native_pch_path)
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
# for use with distcc and gcc >4.0.1 if preprocessed files are accessible
|
# for use with distcc and gcc >4.0.1 if preprocessed files are accessible
|
||||||
# on all remote machines set
|
# on all remote machines set
|
||||||
# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
|
# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
|
||||||
# if you want warnings for invalid header files (which is very inconvenient
|
# if you want warnings for invalid header files (which is very inconvenient
|
||||||
# if you have different versions of the headers for different build types
|
# if you have different versions of the headers for different build types
|
||||||
# you may set _pch_dowarn
|
# you may set _pch_dowarn
|
||||||
IF (_dowarn)
|
IF (_dowarn)
|
||||||
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" -Winvalid-pch " )
|
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" -Winvalid-pch " )
|
||||||
ELSE (_dowarn)
|
ELSE (_dowarn)
|
||||||
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" " )
|
SET(${_cflags} "${PCH_ADDITIONAL_COMPILER_FLAGS} -include \"${CMAKE_CURRENT_BINARY_DIR}/${_header_name}\" " )
|
||||||
ENDIF (_dowarn)
|
ENDIF (_dowarn)
|
||||||
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
|
||||||
|
|
||||||
set(${_cflags} "/Fp${_native_pch_path} /Yu${_header_name}" )
|
ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
set(${_cflags} "/Fp${_native_pch_path} /Yu${_header_name}" )
|
||||||
|
|
||||||
|
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
||||||
ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS )
|
ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS )
|
||||||
|
|
||||||
|
|
||||||
MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
|
MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
|
||||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
|
||||||
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||||
SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.gch")
|
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
||||||
|
SET(${_output} "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.gch")
|
||||||
|
|
||||||
ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
|
ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
|
||||||
|
|
||||||
|
|
||||||
MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
|
MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
|
||||||
|
|
||||||
# to do: test whether compiler flags match between target _targetName
|
# to do: test whether compiler flags match between target _targetName
|
||||||
# and _pch_output_to_use
|
# and _pch_output_to_use
|
||||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||||
|
|
||||||
IF( "${ARGN}" STREQUAL "0")
|
IF(ARGN STREQUAL "0")
|
||||||
SET(_dowarn 0)
|
SET(_dowarn 0)
|
||||||
ELSE( "${ARGN}" STREQUAL "0")
|
ELSE()
|
||||||
SET(_dowarn 1)
|
SET(_dowarn 1)
|
||||||
ENDIF("${ARGN}" STREQUAL "0")
|
ENDIF()
|
||||||
|
|
||||||
|
_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})
|
||||||
|
#MESSAGE("Add flags ${_target_cflags} to ${_targetName} " )
|
||||||
|
SET_TARGET_PROPERTIES(${_targetName}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS ${_target_cflags}
|
||||||
|
)
|
||||||
|
|
||||||
_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})
|
ADD_CUSTOM_TARGET(pch_Generate_${_targetName}
|
||||||
# MESSAGE("Add flags ${_target_cflags} to ${_targetName} " )
|
DEPENDS ${_pch_output_to_use}
|
||||||
SET_TARGET_PROPERTIES(${_targetName}
|
)
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS ${_target_cflags}
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET(pch_Generate_${_targetName}
|
ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
|
||||||
DEPENDS ${_pch_output_to_use}
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
|
|
||||||
|
|
||||||
ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET)
|
ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET)
|
||||||
|
|
||||||
MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
|
MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
|
||||||
|
|
||||||
SET(_PCH_current_target ${_targetName})
|
SET(_PCH_current_target ${_targetName})
|
||||||
|
|
||||||
IF(NOT CMAKE_BUILD_TYPE)
|
IF(NOT CMAKE_BUILD_TYPE)
|
||||||
MESSAGE(FATAL_ERROR
|
MESSAGE(FATAL_ERROR
|
||||||
"This is the ADD_PRECOMPILED_HEADER macro. "
|
"This is the ADD_PRECOMPILED_HEADER macro. "
|
||||||
"You must set CMAKE_BUILD_TYPE!"
|
"You must set CMAKE_BUILD_TYPE!"
|
||||||
|
)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
IF(ARGN STREQUAL "0")
|
||||||
|
SET(_dowarn 0)
|
||||||
|
ELSE()
|
||||||
|
SET(_dowarn 1)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
||||||
|
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
||||||
|
GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output)
|
||||||
|
|
||||||
|
_PCH_WRITE_PCHDEP_CXX(${_targetName} "${_input}" _pch_dephelp_cxx)
|
||||||
|
|
||||||
|
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC "${_pch_dephelp_cxx}" "${_input}" )
|
||||||
|
|
||||||
|
set_target_properties(${_targetName}_pch_dephelp PROPERTIES
|
||||||
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
||||||
|
ARCHIVE_OUTPUT_DIRECTORY "${LIBRARY_OUTPUT_PATH}"
|
||||||
)
|
)
|
||||||
ENDIF(NOT CMAKE_BUILD_TYPE)
|
|
||||||
|
|
||||||
IF( "${ARGN}" STREQUAL "0")
|
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
|
||||||
SET(_dowarn 0)
|
|
||||||
ELSE( "${ARGN}" STREQUAL "0")
|
|
||||||
SET(_dowarn 1)
|
|
||||||
ENDIF("${ARGN}" STREQUAL "0")
|
|
||||||
|
|
||||||
|
#MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
|
||||||
|
#message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(_name ${_input} NAME)
|
ADD_CUSTOM_COMMAND(
|
||||||
GET_FILENAME_COMPONENT(_path ${_input} PATH)
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}"
|
||||||
GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output)
|
COMMAND ${CMAKE_COMMAND} -E copy "${_input}" "${CMAKE_CURRENT_BINARY_DIR}/${_name}" # ensure same directory! Required by gcc
|
||||||
|
DEPENDS "${_input}"
|
||||||
|
)
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(_outdir ${_output} PATH )
|
#message("_command ${_input} ${_output}")
|
||||||
|
_PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} )
|
||||||
|
|
||||||
GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
|
GET_FILENAME_COMPONENT(_outdir ${_output} PATH)
|
||||||
_PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx)
|
ADD_CUSTOM_COMMAND(
|
||||||
|
OUTPUT "${_output}"
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E make_directory "${_outdir}"
|
||||||
|
COMMAND ${_command}
|
||||||
|
DEPENDS "${_input}"
|
||||||
|
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_name}"
|
||||||
|
DEPENDS ${_targetName}_pch_dephelp
|
||||||
|
)
|
||||||
|
|
||||||
IF(${_targetType} STREQUAL SHARED_LIBRARY)
|
ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn})
|
||||||
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx} )
|
|
||||||
ELSE(${_targetType} STREQUAL SHARED_LIBRARY)
|
|
||||||
ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx})
|
|
||||||
ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
|
|
||||||
|
|
||||||
set_target_properties(${_targetName}_pch_dephelp PROPERTIES
|
|
||||||
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
|
||||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
FILE(MAKE_DIRECTORY ${_outdir})
|
|
||||||
|
|
||||||
|
|
||||||
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
|
|
||||||
|
|
||||||
#MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
|
|
||||||
#message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
|
|
||||||
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1)
|
|
||||||
ADD_CUSTOM_COMMAND(
|
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc
|
|
||||||
DEPENDS ${_input}
|
|
||||||
)
|
|
||||||
|
|
||||||
#message("_command ${_input} ${_output}")
|
|
||||||
_PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} )
|
|
||||||
|
|
||||||
#message(${_input} )
|
|
||||||
#message("_output ${_output}")
|
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
|
||||||
OUTPUT ${_output}
|
|
||||||
COMMAND ${_command}
|
|
||||||
DEPENDS ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input} ${_output} ${_dowarn})
|
|
||||||
ENDMACRO(ADD_PRECOMPILED_HEADER)
|
ENDMACRO(ADD_PRECOMPILED_HEADER)
|
||||||
|
|
||||||
|
|
||||||
@ -253,72 +241,66 @@ ENDMACRO(ADD_PRECOMPILED_HEADER)
|
|||||||
|
|
||||||
MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
||||||
|
|
||||||
if(CMAKE_GENERATOR MATCHES Visual*)
|
if(CMAKE_GENERATOR MATCHES "^Visual.*$")
|
||||||
|
SET(_dummy_str "#include \"${_input}\"\n"
|
||||||
|
"// This is required to suppress LNK4221. Very annoying.\n"
|
||||||
|
"void *g_${_targetName}Dummy = 0\;\n")
|
||||||
|
|
||||||
SET(_dummy_str "#include \"${_input}\"\n"
|
# Use of cxx extension for generated files (as Qt does)
|
||||||
"// This is required to suppress LNK4221. Very annoying.\n"
|
SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx)
|
||||||
"void *g_${_targetName}Dummy = 0\;\n")
|
if(EXISTS ${${_targetName}_pch})
|
||||||
|
# Check if contents is the same, if not rewrite
|
||||||
# Use of cxx extension for generated files (as Qt does)
|
# todo
|
||||||
SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx)
|
else()
|
||||||
if(EXISTS ${${_targetName}_pch})
|
FILE(WRITE ${${_targetName}_pch} ${_dummy_str})
|
||||||
# Check if contents is the same, if not rewrite
|
endif()
|
||||||
# todo
|
endif()
|
||||||
else(EXISTS ${${_targetName}_pch})
|
|
||||||
FILE(WRITE ${${_targetName}_pch} ${_dummy_str})
|
|
||||||
endif(EXISTS ${${_targetName}_pch})
|
|
||||||
endif(CMAKE_GENERATOR MATCHES Visual*)
|
|
||||||
|
|
||||||
ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
|
ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
|
||||||
|
|
||||||
|
|
||||||
MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
|
||||||
|
|
||||||
IF( "${ARGN}" STREQUAL "0")
|
IF(ARGN STREQUAL "0")
|
||||||
SET(_dowarn 0)
|
SET(_dowarn 0)
|
||||||
ELSE( "${ARGN}" STREQUAL "0")
|
ELSE()
|
||||||
SET(_dowarn 1)
|
SET(_dowarn 1)
|
||||||
ENDIF("${ARGN}" STREQUAL "0")
|
ENDIF()
|
||||||
|
|
||||||
if(CMAKE_GENERATOR MATCHES Visual*)
|
if(CMAKE_GENERATOR MATCHES "^Visual.*$")
|
||||||
# Auto include the precompile (useful for moc processing, since the use of
|
|
||||||
# precompiled is specified at the target level
|
|
||||||
# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
|
|
||||||
|
|
||||||
GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
|
# Auto include the precompile (useful for moc processing, since the use of
|
||||||
if (${oldProps} MATCHES NOTFOUND)
|
# precompiled is specified at the target level
|
||||||
SET(oldProps "")
|
# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
|
||||||
endif(${oldProps} MATCHES NOTFOUND)
|
|
||||||
|
|
||||||
SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"")
|
GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
|
||||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
|
if (oldProps MATCHES NOTFOUND)
|
||||||
|
SET(oldProps "")
|
||||||
|
endif()
|
||||||
|
|
||||||
#also inlude ${oldProps} to have the same compile options
|
SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"")
|
||||||
SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"")
|
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
|
||||||
|
|
||||||
else(CMAKE_GENERATOR MATCHES Visual*)
|
#also inlude ${oldProps} to have the same compile options
|
||||||
|
SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"")
|
||||||
|
|
||||||
if (CMAKE_GENERATOR MATCHES Xcode)
|
elseif (CMAKE_GENERATOR MATCHES Xcode)
|
||||||
# For Xcode, cmake needs my patch to process
|
|
||||||
# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
|
|
||||||
|
|
||||||
GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
|
# For Xcode, cmake needs my patch to process
|
||||||
if (${oldProps} MATCHES NOTFOUND)
|
# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
|
||||||
SET(oldProps "")
|
|
||||||
endif(${oldProps} MATCHES NOTFOUND)
|
|
||||||
|
|
||||||
# When buiding out of the tree, precompiled may not be located
|
# When buiding out of the tree, precompiled may not be located
|
||||||
# Use full path instead.
|
# Use full path instead.
|
||||||
GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE)
|
GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE)
|
||||||
|
|
||||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
|
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
|
||||||
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
|
SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
|
||||||
|
|
||||||
else (CMAKE_GENERATOR MATCHES Xcode)
|
else()
|
||||||
|
|
||||||
#Fallback to the "old" precompiled suppport
|
#Fallback to the "old" precompiled suppport
|
||||||
#ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn})
|
#ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn})
|
||||||
endif(CMAKE_GENERATOR MATCHES Xcode)
|
|
||||||
endif(CMAKE_GENERATOR MATCHES Visual*)
|
endif()
|
||||||
|
|
||||||
ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
|
ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
|
||||||
|
|||||||
@ -85,18 +85,6 @@ endforeach()
|
|||||||
|
|
||||||
add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs})
|
add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${lib_cuda_hdrs} ${lib_device_hdrs} ${ncv_srcs} ${ncv_hdrs} ${ncv_cuda} ${cuda_objs})
|
||||||
|
|
||||||
if(PCHSupport_FOUND)
|
|
||||||
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*")
|
|
||||||
set(${the_target}_pch "src/precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# For dynamic link numbering convenions
|
# For dynamic link numbering convenions
|
||||||
set_target_properties(${the_target} PROPERTIES
|
set_target_properties(${the_target} PROPERTIES
|
||||||
VERSION ${OPENCV_VERSION}
|
VERSION ${OPENCV_VERSION}
|
||||||
@ -116,32 +104,34 @@ if (BUILD_SHARED_LIBS)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_opencv_precompiled_headers(${the_target})
|
||||||
|
|
||||||
# Additional target properties
|
# Additional target properties
|
||||||
set_target_properties(${the_target} PROPERTIES
|
set_target_properties(${the_target} PROPERTIES
|
||||||
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
||||||
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
|
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
|
||||||
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
|
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
|
||||||
INSTALL_NAME_DIR lib
|
INSTALL_NAME_DIR lib
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add the required libraries for linking:
|
# Add the required libraries for linking:
|
||||||
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} )
|
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${DEPS} )
|
||||||
|
|
||||||
if (HAVE_CUDA)
|
if (HAVE_CUDA)
|
||||||
target_link_libraries(${the_target} ${CUDA_LIBRARIES})
|
target_link_libraries(${the_target} ${CUDA_LIBRARIES})
|
||||||
CUDA_ADD_CUFFT_TO_TARGET(${the_target})
|
CUDA_ADD_CUFFT_TO_TARGET(${the_target})
|
||||||
|
|
||||||
unset(CUDA_npp_LIBRARY CACHE)
|
unset(CUDA_npp_LIBRARY CACHE)
|
||||||
find_cuda_helper_libs(npp)
|
find_cuda_helper_libs(npp)
|
||||||
target_link_libraries(${the_target} ${CUDA_npp_LIBRARY})
|
target_link_libraries(${the_target} ${CUDA_npp_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
if(CMAKE_CROSSCOMPILING)
|
if(CMAKE_CROSSCOMPILING)
|
||||||
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:secchk")
|
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:secchk")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libc")
|
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libc")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Dependencies of this target:
|
# Dependencies of this target:
|
||||||
@ -181,11 +171,8 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
|
|||||||
set(test_deps opencv_${name} opencv_ts opencv_highgui opencv_calib3d ${DEPS})
|
set(test_deps opencv_${name} opencv_ts opencv_highgui opencv_calib3d ${DEPS})
|
||||||
foreach(d ${test_deps})
|
foreach(d ${test_deps})
|
||||||
if(${d} MATCHES "opencv_")
|
if(${d} MATCHES "opencv_")
|
||||||
if(${d} MATCHES "opencv_lapack")
|
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
||||||
else()
|
include_directories("${d_dir}/include")
|
||||||
string(REPLACE "opencv_" "${CMAKE_CURRENT_SOURCE_DIR}/../" d_dir ${d})
|
|
||||||
include_directories("${d_dir}/include")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
@ -203,17 +190,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
|
|||||||
|
|
||||||
add_executable(${the_test_target} ${test_srcs} ${test_hdrs} ${nvidia})
|
add_executable(${the_test_target} ${test_srcs} ${test_hdrs} ${nvidia})
|
||||||
|
|
||||||
if(PCHSupport_FOUND)
|
add_opencv_precompiled_headers(${the_test_target})
|
||||||
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*")
|
|
||||||
set(${the_test_target}_pch "test/test_precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_test_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_test_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Additional target properties
|
# Additional target properties
|
||||||
set_target_properties(${the_test_target} PROPERTIES
|
set_target_properties(${the_test_target} PROPERTIES
|
||||||
|
|||||||
@ -267,17 +267,7 @@ if (BUILD_SHARED_LIBS)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
|
add_opencv_precompiled_headers(${the_target})
|
||||||
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*")
|
|
||||||
set(${the_target}_pch "src/precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# For dynamic link numbering convenions
|
# For dynamic link numbering convenions
|
||||||
if(NOT ANDROID)
|
if(NOT ANDROID)
|
||||||
@ -398,17 +388,7 @@ if(BUILD_TESTS)
|
|||||||
|
|
||||||
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
||||||
|
|
||||||
if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
|
add_opencv_precompiled_headers(${the_target})
|
||||||
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*")
|
|
||||||
set(${the_target}_pch "test/test_precomp.cpp")
|
|
||||||
endif()
|
|
||||||
add_native_precompiled_header(${the_target} ${pch_header})
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_GENERATOR} MATCHES ".*Makefiles")
|
|
||||||
add_precompiled_header(${the_target} ${pch_header})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Additional target properties
|
# Additional target properties
|
||||||
set_target_properties(${the_target} PROPERTIES
|
set_target_properties(${the_target} PROPERTIES
|
||||||
@ -417,7 +397,7 @@ if(BUILD_TESTS)
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_SOLUTION_FOLDERS)
|
if(ENABLE_SOLUTION_FOLDERS)
|
||||||
set_target_properties(${the_target} PROPERTIES FOLDER "tests")
|
set_target_properties(${the_target} PROPERTIES FOLDER "tests")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_dependencies(${the_target} ${test_deps})
|
add_dependencies(${the_target} ${test_deps})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user