Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Fetching contributors…

Cannot retrieve contributors at this time

64 lines (58 sloc) 2.482 kB
Only in OpenCV-2.1.0.patched: CMakeCache.txt
Only in OpenCV-2.1.0.patched: CMakeFiles
diff -ru OpenCV-2.1.0/CMakeLists.txt OpenCV-2.1.0.patched/CMakeLists.txt
--- OpenCV-2.1.0/CMakeLists.txt 2010-04-05 18:24:37.000000000 -0700
+++ OpenCV-2.1.0.patched/CMakeLists.txt 2010-08-22 00:10:11.000000000 -0700
@@ -195,8 +195,6 @@
set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
endif()
-include(OpenCVPCHSupport.cmake REQUIRED)
-
if(UNIX)
include(OpenCVFindPkgConfig.cmake OPTIONAL)
include(CheckFunctionExists)
@@ -297,23 +295,6 @@
set(ALIAS_LIBRARIES ${ALIAS}_LIBRARIES)
PKG_CHECK_MODULES(${ALIAS} ${module_name})
-
- if (${ALIAS_FOUND})
- set(${define} 1)
- foreach(P "${ALIAS_INCLUDE_DIRS}")
- if (${P})
- list(APPEND HIGHGUI_INCLUDE_DIRS ${${P}})
- endif()
- endforeach()
-
- foreach(P "${ALIAS_LIBRARY_DIRS}")
- if (${P})
- list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
- endif()
- endforeach()
-
- list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
- endif()
endif()
endmacro()
@@ -1041,7 +1022,7 @@
endif()
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
- install(DIRECTORY 3rdparty apps interfaces src tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
+ install(DIRECTORY 3rdparty interfaces src tests utils DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY doc/plastex DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
@@ -1054,7 +1035,6 @@
# Subdirectories:
#-----------------------------------
add_subdirectory(src)
-add_subdirectory(apps)
if(BUILD_LATEX_DOCS)
include(OpenCVFindLATEX.cmake REQUIRED)
diff -ru OpenCV-2.1.0/src/CMakeLists.txt OpenCV-2.1.0.patched/src/CMakeLists.txt
--- OpenCV-2.1.0/src/CMakeLists.txt 2010-04-05 18:24:42.000000000 -0700
+++ OpenCV-2.1.0.patched/src/CMakeLists.txt 2010-08-22 00:07:51.000000000 -0700
@@ -2,4 +2,3 @@
add_subdirectory(cv)
add_subdirectory(cvaux)
add_subdirectory(ml)
-add_subdirectory(highgui)
Jump to Line
Something went wrong with that request. Please try again.