Update find mynteye in cmakelists of wrappers

This commit is contained in:
John Zhao 2018-09-04 15:59:38 +08:00
parent 4d5ff16f82
commit 02856194a0
2 changed files with 16 additions and 10 deletions

View File

@ -47,14 +47,6 @@ if(OS_MAC)
endif() endif()
endif() endif()
# options
include(${PRO_DIR}/cmake/Option.cmake)
if(NOT WITH_API)
message(FATAL_ERROR "Must with API layer :(")
endif()
# flags # flags
if(OS_WIN) if(OS_WIN)
@ -81,6 +73,18 @@ LIST(APPEND CMAKE_PREFIX_PATH ${PRO_DIR}/_install/lib/cmake)
find_package(mynteye REQUIRED) find_package(mynteye REQUIRED)
message(STATUS "Found mynteye: ${mynteye_VERSION}") message(STATUS "Found mynteye: ${mynteye_VERSION}")
if(NOT mynteye_WITH_API)
message(FATAL_ERROR "Must with API layer :(")
endif()
include(${PRO_DIR}/cmake/DetectOpenCV.cmake)
if(mynteye_WITH_GLOG)
include(${PRO_DIR}/cmake/DetectGLog.cmake)
endif()
## boost & python
if(CMAKE_VERSION VERSION_LESS "3.10" OR CMAKE_VERSION VERSION_EQUAL "3.10") if(CMAKE_VERSION VERSION_LESS "3.10" OR CMAKE_VERSION VERSION_EQUAL "3.10")
find_package(Boost ${BOOST_FIND_VERSION} REQUIRED find_package(Boost ${BOOST_FIND_VERSION} REQUIRED
COMPONENTS python${PYTHON_BOOST_CODE} # numpy${PYTHON_BOOST_CODE} COMPONENTS python${PYTHON_BOOST_CODE} # numpy${PYTHON_BOOST_CODE}
@ -99,8 +103,6 @@ message(STATUS "Found PythonLibs: ${PYTHONLIBS_VERSION_STRING}")
message(STATUS " PYTHON_INCLUDE_DIRS: ${PYTHON_INCLUDE_DIRS}") message(STATUS " PYTHON_INCLUDE_DIRS: ${PYTHON_INCLUDE_DIRS}")
message(STATUS " PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}") message(STATUS " PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}")
include(${PRO_DIR}/cmake/DetectOpenCV.cmake)
#LIST(APPEND CMAKE_MODULE_PATH ${PRO_DIR}/cmake) #LIST(APPEND CMAKE_MODULE_PATH ${PRO_DIR}/cmake)
# targets # targets

View File

@ -83,6 +83,10 @@ LIST(APPEND CMAKE_PREFIX_PATH ${SDK_DIR}/_install/lib/cmake)
find_package(mynteye REQUIRED) find_package(mynteye REQUIRED)
message(STATUS "Found mynteye: ${mynteye_VERSION}") message(STATUS "Found mynteye: ${mynteye_VERSION}")
if(NOT mynteye_WITH_API)
message(FATAL_ERROR "Must with API layer :(")
endif()
include(${SDK_DIR}/cmake/DetectOpenCV.cmake) include(${SDK_DIR}/cmake/DetectOpenCV.cmake)
if(mynteye_WITH_GLOG) if(mynteye_WITH_GLOG)