From 428fb726251c1ab06e7056ceca2e55b7146c4ef9 Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu, 14 Nov 2013 19:14:38 +0400
Subject: [PATCH] Made the generated file templates' naming more consistent.

The general convention is <output file name> + ".in".
---
 cmake/OpenCVGenHeaders.cmake                                 | 2 +-
 cmake/OpenCVGenPkgconfig.cmake                               | 4 +++-
 cmake/templates/{cvconfig.h.cmake => cvconfig.h.in}          | 0
 cmake/templates/{opencv-XXX.pc.cmake.in => opencv-XXX.pc.in} | 0
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename cmake/templates/{cvconfig.h.cmake => cvconfig.h.in} (100%)
 rename cmake/templates/{opencv-XXX.pc.cmake.in => opencv-XXX.pc.in} (100%)

diff --git a/cmake/OpenCVGenHeaders.cmake b/cmake/OpenCVGenHeaders.cmake
index c7129fefa3..35da0fb4be 100644
--- a/cmake/OpenCVGenHeaders.cmake
+++ b/cmake/OpenCVGenHeaders.cmake
@@ -1,5 +1,5 @@
 # platform-specific config file
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/cvconfig.h.cmake" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h")
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/cvconfig.h.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h")
 
 # ----------------------------------------------------------------------------
 #  opencv_modules.hpp based on actual modules list
diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
index a36b70e941..cd54f11bf3 100644
--- a/cmake/OpenCVGenPkgconfig.cmake
+++ b/cmake/OpenCVGenPkgconfig.cmake
@@ -76,7 +76,9 @@ if(INSTALL_TO_MANGLED_PATHS)
 else()
   set(OPENCV_PC_FILE_NAME opencv.pc)
 endif()
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}" @ONLY IMMEDIATE)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.in"
+               "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}"
+               @ONLY IMMEDIATE)
 
 if(UNIX AND NOT ANDROID)
   install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig)
diff --git a/cmake/templates/cvconfig.h.cmake b/cmake/templates/cvconfig.h.in
similarity index 100%
rename from cmake/templates/cvconfig.h.cmake
rename to cmake/templates/cvconfig.h.in
diff --git a/cmake/templates/opencv-XXX.pc.cmake.in b/cmake/templates/opencv-XXX.pc.in
similarity index 100%
rename from cmake/templates/opencv-XXX.pc.cmake.in
rename to cmake/templates/opencv-XXX.pc.in