CMakeLists.txt.patch

stathis --, 2010-11-04 02:35 pm

Download (3.5 kB)

 
CMakeLists.txt.new 2010-11-04 15:30:10.122609400 +0200
1057 1057
set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
1058 1058

  
1059 1059
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"")
1060
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"")
1060
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
1061 1061
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1062 1062

  
1063 1063
if(UNIX)
......
1069 1069
#  Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake  -> For use within binary installers/packages
1070 1070
# -------------------------------------------------------------------------------------------
1071 1071
if(WIN32)
1072

  
1072 1073
    # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
1074
    # support for 3rdparty libraries.
1073 1075

  
1074 1076
    # This will expand to, for example, <program files>/OpenCV 1.1.0/include
1075
    set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/include\" \"\${THIS_OPENCV_CONFIG_PATH}/include/opencv\"")
1076
        set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"${THIS_OPENCV_CONFIG_PATH}\"")
1077
    set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/include\" 
1078
                                        \"\${THIS_OPENCV_CONFIG_PATH}/include/opencv\" 
1079
                                        \"\${THIS_OPENCV_CONFIG_PATH}/3rdparty/include\"")
1080

  
1081
    set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}\"")
1077 1082

  
1078 1083
    # This will expand to, for example, <program files>/OpenCV 1.1.0/lib
1079
    set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/lib\"")
1084
	# support for 3rdparty libraries.
1085
    set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/lib\" 
1086
                                    \"\${THIS_OPENCV_CONFIG_PATH}/3rdparty/lib\"")
1080 1087

  
1081 1088
    #exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
1082
    exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"")
1089
    exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
1083 1090
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1091

  
1092
    # Configure the OpenCVConfig.cmake file to have the right paths pointing to the install directory
1093
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_INSTALL_PREFIX}/OpenCVConfig.cmake" IMMEDIATE @ONLY)
1094

  
1095
    # if videoInput support is enabled (which is by default on WIN32) copy the static library required to the installation path
1096
    # DESTINATION could also be "${CMAKE_INSTALL_PREFIX}/lib") to simplify dev environment setup of client applications
1097
    IF(HAVE_VIDEOINPUT)
1098
        install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/videoInput.lib" "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lib/videoInput64.lib"
1099
                DESTINATION "${CMAKE_INSTALL_PREFIX}/3rdparty/lib")
1100

  
1101
        install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include/videoInput.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/3rdparty/include")
1102
    ENDIF()
1103

  
1104
    # Add the OpenCV configuration header to the install path
1105
    # Useful for instance if a client application checks against the features OpenCV has been compiled with
1106
    install(FILES "${CMAKE_BINARY_DIR}/cvconfig.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include")
1107

  
1084 1108
endif()
1085 1109

  
1086 1110