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

Removed useless VERSION macro (and CMake variable)

Browse Source
This commit is contained in:
Roman Donchenko 2013-07-11 14:28:41 +04:00
parent 06742247be
commit 78cb920bc8
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/OpenCVGenPkgconfig.cmake
View File

@ -12,7 +12,6 @@ set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\${prefix}") set(exec_prefix "\${prefix}")
set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
set(VERSION ${OPENCV_VERSION})
if(CMAKE_BUILD_TYPE MATCHES "Release") if(CMAKE_BUILD_TYPE MATCHES "Release")
set(ocv_optkind OPT) set(ocv_optkind OPT)

3
cmake/templates/cvconfig.h.cmake
View File

@ -91,9 +91,6 @@
/* OpenCV compiled as static or dynamic libs */ /* OpenCV compiled as static or dynamic libs */
#cmakedefine BUILD_SHARED_LIBS #cmakedefine BUILD_SHARED_LIBS
/* Version number of package */
#define VERSION "${PACKAGE_VERSION}"
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */
#cmakedefine WORDS_BIGENDIAN #cmakedefine WORDS_BIGENDIAN

2
cmake/templates/opencv-XXX.pc.cmake.in
View File

@ -8,6 +8,6 @@ includedir_new=@includedir@
Name: OpenCV Name: OpenCV
Description: Open Source Computer Vision Library Description: Open Source Computer Vision Library
Version: @VERSION@ Version: @OPENCV_VERSION@
Libs: @OpenCV_LIB_COMPONENTS@ Libs: @OpenCV_LIB_COMPONENTS@
Cflags: -I${includedir_old} -I${includedir_new} Cflags: -I${includedir_old} -I${includedir_new}