]> rtime.felk.cvut.cz Git - opencv.git/commitdiff
fixed broken OpenCVConfig.cmake due to last changes to allow path with spaces.
authorjlblanco <jlblanco@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Wed, 9 Sep 2009 10:08:14 +0000 (10:08 +0000)
committerjlblanco <jlblanco@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Wed, 9 Sep 2009 10:08:14 +0000 (10:08 +0000)
git-svn-id: https://code.ros.org/svn/opencv/trunk@2105 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

opencv/CMakeLists.txt

index af6ecb7e7a60a152ee7fa6d5ddf0d643f565fb9a..b3fa88c79087db2b3416cbdb0bbb6ce3a4475bc5 100644 (file)
@@ -687,7 +687,7 @@ add_subdirectory(3rdparty)
 # -------------------------------------------------------------------------------------------\r
 \r
 # -------------------------------------------------------------------------------------------\r
-#  Part 1/2: ${BIN_DIR}/OpenCVConfig.cmake              -> For use *without* "make install"\r
+#  Part 1/3: ${BIN_DIR}/OpenCVConfig.cmake              -> For use *without* "make install"\r
 # -------------------------------------------------------------------------------------------\r
 \r
 # Name of libraries is: libcv.so.1.1.0, etc...\r
@@ -695,17 +695,14 @@ add_subdirectory(3rdparty)
 # Already done above.\r
 \r
 # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:\r
-set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE)\r
-list(APPEND CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\"")\r
-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
+set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\" \"${CMAKE_CURRENT_SOURCE_DIR}/include\" \"${CMAKE_CURRENT_SOURCE_DIR}/include/opencv\"")\r
 \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
 # --------------------------------------------------------------------------------------------\r
-#  Part 2/2: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"\r
+#  Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"\r
 # -------------------------------------------------------------------------------------------\r
 # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:\r
 \r