More fixes for path with spaces.

git-svn-id: https://code.ros.org/svn/opencv/trunk@2087 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 012ef5a73ca9fabd84e5ce1e53ec7c78482ba727..9c539e930aae89d35f17cd50eec9bf11367ea2a8 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -696,7 +696,7 @@ list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\
 list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${CMAKE_CURRENT_SOURCE_DIR}/include\"")\r
 list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${CMAKE_CURRENT_SOURCE_DIR}/include/opencv\"")\r
 \r
-set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"${LIBRARY_OUTPUT_PATH}\"")\r
+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${LIBRARY_OUTPUT_PATH}")\r
 \r
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)\r
 \r

diff --git a/opencv/OpenCVConfig.cmake.in b/opencv/OpenCVConfig.cmake.in
index 346bf6bae045d2eb257c1789cc2faa2f1e4db315..a47e05fae20863c4092de23ab93f1e3d729965b9 100644 (file)
--- a/opencv/OpenCVConfig.cmake.in
+++ b/opencv/OpenCVConfig.cmake.in
@@ -1,62 +1,62 @@
-# ===================================================================================
-#  The OpenCV CMake configuration file
-#
-#             ** File generated automatically, do not modify **
-#
-#  Usage from an external project: 
-#    In your CMakeLists.txt, add these lines:
-#
-#    FIND_PACKAGE(OpenCV REQUIRED )
-#    TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${OpenCV_LIBS})   
-#
-#    This file will define the following variables:
-#      - OpenCV_LIBS          : The list of libraries to links against.
-#      - OpenCV_LIB_DIR       : The directory where lib files are. Calling LINK_DIRECTORIES
-#                                with this path is NOT needed.
-#      - OpenCV_VERSION       : The  version of this OpenCV build. Example: "1.2.0"
-#      - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION. Example: "1"
-#      - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION. Example: "2"
-#      - OpenCV_VERSION_PATCH : Patch version part of OpenCV_VERSION. Example: "0"
-#
-# ===================================================================================
-
-
-# Extract the directory where *this* file has been installed (determined at cmake run-time)
-#  This variable may or may not be used below, depending on the parsing of OpenCVConfig.cmake
-get_filename_component(THIS_OPENCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-# ======================================================
-# Include directories to add to the user project:
-# ======================================================
-INCLUDE_DIRECTORIES(@CMAKE_INCLUDE_DIRS_CONFIGCMAKE@)
-
-# ======================================================
-# Link directories to add to the user project:
-# ======================================================
-LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@)
-# Provide the libs directory anyway, it may be needed in some cases.
-SET(OpenCV_LIB_DIR "@CMAKE_LIB_DIRS_CONFIGCMAKE@")
-
-# ====================================================================
-# Link libraries: e.g.   cxcore110.so, cv110.lib / cv110d.lib, etc...
-# ====================================================================
-set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux)
-SET(OpenCV_LIBS "")
-foreach(__CVLIB ${OPENCV_LIB_COMPONENTS})
-       # CMake>=2.6 supports the notation "debug XXd optimized XX"
-       if (CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)
-               # Modern CMake:
-               SET(OpenCV_LIBS ${OpenCV_LIBS} debug ${__CVLIB}@OPENCV_DLLVERSION@@OPENCV_DEBUG_POSTFIX@ optimized ${__CVLIB}@OPENCV_DLLVERSION@)
-       else(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)
-               # Old CMake:
-               SET(OpenCV_LIBS ${OpenCV_LIBS} ${__CVLIB}@OPENCV_DLLVERSION@)
-       endif(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)
-endforeach(__CVLIB)
-
-# ======================================================
-#  Version variables: 
-# ======================================================
-SET(OpenCV_VERSION @OPENCV_VERSION@)
-SET(OpenCV_VERSION_MAJOR  @OPENCV_VERSION_MAJOR@)
-SET(OpenCV_VERSION_MINOR  @OPENCV_VERSION_MINOR@)
-SET(OpenCV_VERSION_PATCH  @OPENCV_VERSION_PATCH@)
+# ===================================================================================\r
+#  The OpenCV CMake configuration file\r
+#\r
+#             ** File generated automatically, do not modify **\r
+#\r
+#  Usage from an external project: \r
+#    In your CMakeLists.txt, add these lines:\r
+#\r
+#    FIND_PACKAGE(OpenCV REQUIRED )\r
+#    TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${OpenCV_LIBS})   \r
+#\r
+#    This file will define the following variables:\r
+#      - OpenCV_LIBS          : The list of libraries to links against.\r
+#      - OpenCV_LIB_DIR       : The directory where lib files are. Calling LINK_DIRECTORIES\r
+#                                with this path is NOT needed.\r
+#      - OpenCV_VERSION       : The  version of this OpenCV build. Example: "1.2.0"\r
+#      - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION. Example: "1"\r
+#      - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION. Example: "2"\r
+#      - OpenCV_VERSION_PATCH : Patch version part of OpenCV_VERSION. Example: "0"\r
+#\r
+# ===================================================================================\r
+\r
+\r
+# Extract the directory where *this* file has been installed (determined at cmake run-time)\r
+#  This variable may or may not be used below, depending on the parsing of OpenCVConfig.cmake\r
+get_filename_component(THIS_OPENCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)\r
+\r
+# ======================================================\r
+# Include directories to add to the user project:\r
+# ======================================================\r
+INCLUDE_DIRECTORIES(@CMAKE_INCLUDE_DIRS_CONFIGCMAKE@)\r
+\r
+# ======================================================\r
+# Link directories to add to the user project:\r
+# ======================================================\r
+LINK_DIRECTORIES("@CMAKE_LIB_DIRS_CONFIGCMAKE@")\r
+# Provide the libs directory anyway, it may be needed in some cases.\r
+SET(OpenCV_LIB_DIR "@CMAKE_LIB_DIRS_CONFIGCMAKE@")\r
+\r
+# ====================================================================\r
+# Link libraries: e.g.   cxcore110.so, cv110.lib / cv110d.lib, etc...\r
+# ====================================================================\r
+set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux)\r
+SET(OpenCV_LIBS "")\r
+foreach(__CVLIB ${OPENCV_LIB_COMPONENTS})\r
+       # CMake>=2.6 supports the notation "debug XXd optimized XX"\r
+       if (CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)\r
+               # Modern CMake:\r
+               SET(OpenCV_LIBS ${OpenCV_LIBS} debug ${__CVLIB}@OPENCV_DLLVERSION@@OPENCV_DEBUG_POSTFIX@ optimized ${__CVLIB}@OPENCV_DLLVERSION@)\r
+       else(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)\r
+               # Old CMake:\r
+               SET(OpenCV_LIBS ${OpenCV_LIBS} ${__CVLIB}@OPENCV_DLLVERSION@)\r
+       endif(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)\r
+endforeach(__CVLIB)\r
+\r
+# ======================================================\r
+#  Version variables: \r
+# ======================================================\r
+SET(OpenCV_VERSION @OPENCV_VERSION@)\r
+SET(OpenCV_VERSION_MAJOR  @OPENCV_VERSION_MAJOR@)\r
+SET(OpenCV_VERSION_MINOR  @OPENCV_VERSION_MINOR@)\r
+SET(OpenCV_VERSION_PATCH  @OPENCV_VERSION_PATCH@)\r