Skip to content

E
eos
Commit 672fb659 authored by ggoldma1's avatar ggoldma1
Browse files
Options

cmake fixes for auxiliary projects.

parent 00257c36
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
examples/CMakeLists.txt
View file @ 672fb659
...@@ -7,10 +7,10 @@ cmake_minimum_required(VERSION 2.8.10) ...@@ -7,10 +7,10 @@ cmake_minimum_required(VERSION 2.8.10)
#version variable is defined from project root's CMakeLists #version variable is defined from project root's CMakeLists
if("${OpenCV_VERSION_MAJOR}$" EQUAL 2) if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
message(STATUS "OpenCV 2.x detected") message(STATUS "OpenCV 2.x detected")
find_package(OpenCV 2.4.3 REQUIRED core imgproc highgui) find_package(OpenCV 2 REQUIRED core imgproc highgui)
elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3) elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility") message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
find_package(OpenCV 3.0.0 REQUIRED core imgproc imgcodecs) find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
endif() endif()
message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}") message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}") message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
......
matlab/CMakeLists.txt
View file @ 672fb659
...@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.7.0) ...@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.7.0)
find_package(Matlab COMPONENTS MX_LIBRARY REQUIRED) find_package(Matlab COMPONENTS MX_LIBRARY REQUIRED)
# Dependencies of the modules: # Dependencies of the modules:
find_package(OpenCV 2.4.3 REQUIRED core) find_package(OpenCV REQUIRED core)
set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE) set_target_properties(${OpenCV_LIBS} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
if(MSVC) if(MSVC)
# The standard find_package for boost on Win finds the dynamic libs, so for dynamic linking to boost we need to #define: # The standard find_package for boost on Win finds the dynamic libs, so for dynamic linking to boost we need to #define:
......
utils/CMakeLists.txt
View file @ 672fb659
...@@ -7,10 +7,10 @@ cmake_minimum_required(VERSION 2.8.12) ...@@ -7,10 +7,10 @@ cmake_minimum_required(VERSION 2.8.12)
#version variable is defined from project root's CMakeLists #version variable is defined from project root's CMakeLists
if("${OpenCV_VERSION_MAJOR}$" EQUAL 2) if("${OpenCV_VERSION_MAJOR}$" EQUAL 2)
message(STATUS "OpenCV 2.x detected") message(STATUS "OpenCV 2.x detected")
find_package(OpenCV 2.4.3 REQUIRED core imgproc highgui) find_package(OpenCV 2 REQUIRED core imgproc highgui)
elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3) elseif("${OpenCV_VERSION_MAJOR}$" EQUAL 3)
message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility") message(STATUS "OpenCV 3.x detected - including imgcodecs for compatibility")
find_package(OpenCV 3.0.0 REQUIRED core imgproc imgcodecs) find_package(OpenCV 3 REQUIRED core imgproc imgcodecs)
endif() endif()
message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}") message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}") message(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment