Merge pull request #10488 from alalek:cmake_simplify_configure_macro

45c5f0a5 · Alexander Alekhin · f46eff4e · 94b23687 · 45c5f0a5
Commit 45c5f0a5 authored Jan 04, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OpenCVUtils.cmake cmake/OpenCVUtils.cmake +2 -2

No files found.
--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
@@ -32,8 +32,8 @@ function(ocv_cmake_eval var_name)
 endfunction()

 macro(ocv_cmake_configure file_name var_name)
-  configure_file(${file_name} "${CMAKE_BINARY_DIR}/CMakeConfig-${var_name}.cmake" ${ARGN})
-  file(READ "${CMAKE_BINARY_DIR}/CMakeConfig-${var_name}.cmake" ${var_name})
+  file(READ "${file_name}" __config)
+  string(CONFIGURE "${__config}" ${var_name} ${ARGN})
 endmacro()

 macro(ocv_update VAR)