From 019122fba75bc210e77bdc12310fe0b2aa7c65bd Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 24 Apr 2012 07:13:50 +0000 Subject: [PATCH] Fixed dependencies for cmake status embeeded into opencv core --- CMakeLists.txt | 2 ++ cmake/OpenCVUtils.cmake | 9 +++++++++ modules/core/CMakeLists.txt | 8 +------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6017be96c..17738ed9a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -938,6 +938,8 @@ status(" cvconfig.h is in:" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}") status("-----------------------------------------------------------------") status("") +ocv_finalize_status() + # ---------------------------------------------------------------------------- # Warn in the case of in-source build # ---------------------------------------------------------------------------- diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index fdb151f50b..599404d37f 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -113,6 +113,15 @@ function(ocv_output_status msg) file(APPEND "${OPENCV_BUILD_INFO_FILE}" "\"${msg}\\n\"\n") endfunction() +macro(ocv_finalize_status) + if(NOT OPENCV_SKIP_STATUS_FINALIZATION) + if(TARGET opencv_core) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENCV_BUILD_INFO_FILE}" "${opencv_core_BINARY_DIR}/version_string.inc" OUTPUT_QUIET) + endif() + endif() +endmacro() + + # Status report function. # Automatically align right column and selects text based on condition. # Usage: diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 3f321b6d92..de9c846894 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -16,13 +16,7 @@ else() set(cuda_link_libs "") endif() -set(OPENCV_VERSION_FILE "${opencv_core_BINARY_DIR}/version_string.inc") -add_custom_command(OUTPUT "${OPENCV_VERSION_FILE}" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENCV_BUILD_INFO_FILE}" "${OPENCV_VERSION_FILE}" - MAIN_DEPENDENCY "${OPENCV_BUILD_INFO_FILE}" - COMMENT "") - -ocv_glob_module_sources(SOURCES ${lib_cuda} ${cuda_objs} "${OPENCV_VERSION_FILE}") +ocv_glob_module_sources(SOURCES ${lib_cuda} ${cuda_objs} "${opencv_core_BINARY_DIR}/version_string.inc") ocv_create_module(${cuda_link_libs}) ocv_add_precompiled_headers(${the_module})