CMakeLists.txt.patch

adds support for OpenCVConfigVersion.cmake - stathis --, 2010-12-05 09:26 pm

Download (2.3 kB)

 
CMakeLists.txt.new 2010-12-05 22:15:52.359375000 +0200
1097 1097
set(CMAKE_LIB_DIRS_CONFIGCMAKE "${LIBRARY_OUTPUT_PATH}")
1098 1098

  
1099 1099
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1100
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfigVersion.cmake" IMMEDIATE @ONLY)
1100 1101

  
1101 1102
# --------------------------------------------------------------------------------------------
1102 1103
#  Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
......
1110 1111

  
1111 1112
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
1112 1113
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1114
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfigVersion.cmake" IMMEDIATE @ONLY)
1113 1115

  
1114 1116
if(UNIX)
1115 1117
    # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/FOO/FOOConfig.cmake, so:
......
1137 1139
    #exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
1138 1140
    exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
1139 1141
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1142
	 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfigVersion.cmake" IMMEDIATE @ONLY)
1143
		
1140 1144
    # Install the OpenCVConfig.cmake file which has the right paths pointing to the install directory 
1141 1145
    install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/") 
1146
	 install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/") 
1142 1147

  
1143 1148
    # if videoInput support is enabled (which is by default on WIN32) copy the static library required to the installation path
1144 1149
    # DESTINATION could also be "${CMAKE_INSTALL_PREFIX}/lib") to simplify dev environment setup of client applications