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

Made the generated file templates' naming more consistent.

Browse Source 
The general convention is <output file name> + ".in".
This commit is contained in:
Roman Donchenko 2013-11-14 19:14:38 +04:00
parent 01f8645bc8
commit 428fb72625
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVGenHeaders.cmake
View File

@ -1,5 +1,5 @@
# platform-specific config file # 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 # opencv_modules.hpp based on actual modules list

4
cmake/OpenCVGenPkgconfig.cmake
View File

@ -76,7 +76,9 @@ if(INSTALL_TO_MANGLED_PATHS)
else() else()
set(OPENCV_PC_FILE_NAME opencv.pc) set(OPENCV_PC_FILE_NAME opencv.pc)
endif() 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) if(UNIX AND NOT ANDROID)
install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig) install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig)

0
cmake/templates/cvconfig.h.cmake → cmake/templates/cvconfig.h.in
View File

0
cmake/templates/opencv-XXX.pc.cmake.in → cmake/templates/opencv-XXX.pc.in
View File