CMake will find OpenCV by itself.

Thanks to recastrodiaz!
PoshSylvester · Dec 20, 2010 · 206f408 · 206f408
1 parent b452124
commit 206f408
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 101 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,6 +21,10 @@
 # TODO Check it.
 cmake_minimum_required(VERSION 2.0)
 
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
 project(cvBlob)
 
 set(PACKAGE cvBlob)

diff --git a/CMakeScripts/FindOpenCV.cmake b/CMakeScripts/FindOpenCV.cmake
diff --git a/cvBlob/CMakeLists.txt b/cvBlob/CMakeLists.txt
@@ -19,8 +19,6 @@
 
 find_package(OpenCV REQUIRED)
 
-include_directories(${OpenCV_INCLUDE_DIR})
-
 set(cvBlob_CVBLOB cvblob.cpp
                    cvlabel.cpp
 		   cvaux.cpp

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 find_package(OpenCV REQUIRED)
 
-include_directories(${OpenCV_INCLUDE_DIR})
 include_directories(${cvBlob_SOURCE_DIR}/cvBlob)
 
 # TEST
@@ -33,7 +32,7 @@ set_source_files_properties(${TEST_SRC}
 add_executable(test ${TEST_SRC})
 
 target_link_libraries(test cvblob)
-target_link_libraries(test ${OpenCV_LIBRARIES})
+target_link_libraries(test ${OpenCV_LIBS})
 
 install(TARGETS test
         RUNTIME DESTINATION bin
@@ -52,7 +51,7 @@ set_source_files_properties(${TEST_RANDOM_SRC}
 add_executable(test_random ${TEST_RANDOM_SRC})
 
 target_link_libraries(test_random cvblob)
-target_link_libraries(test_random ${OpenCV_LIBRARIES})
+target_link_libraries(test_random ${OpenCV_LIBS})
 
 install(TARGETS test_random
         RUNTIME DESTINATION bin
@@ -71,7 +70,7 @@ set_source_files_properties(${TEST_TRACKING_SRC}
 add_executable(test_tracking ${TEST_TRACKING_SRC})
 
 target_link_libraries(test_tracking cvblob)
-target_link_libraries(test_tracking ${OpenCV_LIBRARIES})
+target_link_libraries(test_tracking ${OpenCV_LIBS})
 
 install(TARGETS test_tracking
         RUNTIME DESTINATION bin