Fix the conflict

2018-11-24 16:43:38 +08:00
parent 210ddba1ba 0fc1196b52
commit 1811f20a14
264 changed files with 29737 additions and 970 deletions
--- a/cmake/Common.cmake
+++ b/cmake/Common.cmake
@@ -70,7 +70,9 @@ macro(set_outdir ARCHIVE_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY RUNTIME_OUTPU
  endforeach()
 endmacro()

-set(__exe2bat_relative_path false)
+if(NOT __exe2bat_relative_path)
+  set(__exe2bat_relative_path false)
+endif()

 macro(exe2bat exe_name exe_dir dll_search_paths)
  message(STATUS "Generating ${exe_name}.bat")
--- a/cmake/DetectOpenCV.cmake
+++ b/cmake/DetectOpenCV.cmake
@@ -15,14 +15,25 @@
 include(${CMAKE_CURRENT_LIST_DIR}/IncludeGuard.cmake)
 cmake_include_guard()

-find_package(OpenCV REQUIRED)
-message(STATUS "Found OpenCV: ${OpenCV_VERSION}")
-if(OpenCV_VERSION VERSION_LESS 3.0)
-  add_definitions(-DUSE_OPENCV2)
-elseif(OpenCV_VERSION VERSION_LESS 4.0)
-  add_definitions(-DUSE_OPENCV3)
+if(OpenCV_FIND_QUIET)
+  find_package(OpenCV QUIET)
 else()
-  add_definitions(-DUSE_OPENCV4)
+  find_package(OpenCV REQUIRED)
+endif()
+
+if(OpenCV_FOUND)
+
+#message(STATUS "Found OpenCV: ${OpenCV_VERSION}")
+
+set(WITH_OPENCV TRUE)
+add_definitions(-DWITH_OPENCV)
+
+if(OpenCV_VERSION VERSION_LESS 3.0)
+  add_definitions(-DWITH_OPENCV2)
+elseif(OpenCV_VERSION VERSION_LESS 4.0)
+  add_definitions(-DWITH_OPENCV3)
+else()
+  add_definitions(-DWITH_OPENCV4)
 endif()

 list(FIND OpenCV_LIBS "opencv_world" __index)
@@ -35,3 +46,9 @@ if(MSVC OR MSYS OR MINGW)
 else()
  set(OpenCV_LIB_SEARCH_PATH "${OpenCV_LIB_PATH}")
 endif()
+
+else()
+
+set(WITH_OPENCV FALSE)
+
+endif()
--- a/cmake/Option.cmake
+++ b/cmake/Option.cmake
@@ -12,11 +12,141 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-option(WITH_API "Build with API layer, need OpenCV" ON)
+include(${CMAKE_CURRENT_LIST_DIR}/IncludeGuard.cmake)
+cmake_include_guard()

-message(STATUS "Options:")
-message(STATUS "  WITH_API: ${WITH_API}")
+include(${CMAKE_CURRENT_LIST_DIR}/Utils.cmake)
+
+
+# build components
+
+option(WITH_API "Build with API layer, need OpenCV" ON)
+option(WITH_DEVICE_INFO_REQUIRED "Build with device info required" ON)
+
+# 3rdparty components
+
+option(WITH_BOOST "Include Boost support" ON)

 # How to install glog?
 #   Ubuntu: `sudo apt-get install libgoogle-glog-dev`
 option(WITH_GLOG "Include glog support" OFF)
+
+# packages
+
+if(WITH_API)
+  include(${CMAKE_CURRENT_LIST_DIR}/DetectOpenCV.cmake)
+endif()
+
+if(WITH_DEVICE_INFO_REQUIRED)
+  add_definitions(-DWITH_DEVICE_INFO_REQUIRED)
+endif()
+
+if(WITH_BOOST)
+  find_package(Boost COMPONENTS filesystem)
+  if(Boost_FOUND)
+    set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+    set(WITH_FILESYSTEM TRUE)
+    set(WITH_BOOST_FILESYSTEM TRUE)
+    add_definitions(-DWITH_FILESYSTEM)
+    add_definitions(-DWITH_BOOST_FILESYSTEM)
+  endif()
+endif()
+
+if(NOT WITH_FILESYSTEM)
+  if(MSVC OR MSYS OR MINGW)  # win
+    set(WITH_FILESYSTEM TRUE)
+    set(WITH_NATIVE_FILESYSTEM TRUE)
+    add_definitions(-DWITH_FILESYSTEM)
+    add_definitions(-DWITH_NATIVE_FILESYSTEM)
+  endif()
+endif()
+
+if(WITH_GLOG)
+  include(${CMAKE_CURRENT_LIST_DIR}/DetectGLog.cmake)
+endif()
+
+find_package(CUDA QUIET)
+
+# summary
+
+set_version_values(CMAKE_CXX_COMPILER_VERSION)
+
+status("")
+status("Platform:")
+status("  HOST_OS: ${HOST_OS}")
+status("  HOST_NAME: ${HOST_NAME}")
+status("  HOST_ARCH: ${HOST_ARCH}")
+status("  HOST_COMPILER: ${CMAKE_CXX_COMPILER_ID}")
+status("    COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
+status("    COMPILER_VERSION_MAJOR: ${CMAKE_CXX_COMPILER_VERSION_MAJOR}")
+status("    COMPILER_VERSION_MINOR: ${CMAKE_CXX_COMPILER_VERSION_MINOR}")
+status("    COMPILER_VERSION_PATCH: ${CMAKE_CXX_COMPILER_VERSION_PATCH}")
+status("    COMPILER_VERSION_TWEAK: ${CMAKE_CXX_COMPILER_VERSION_TWEAK}")
+if(CUDA_FOUND)
+  status("  CUDA_VERSION: ${CUDA_VERSION}")
+  status("    CUDA_VERSION_MAJOR: ${CUDA_VERSION_MAJOR}")
+  status("    CUDA_VERSION_MINOR: ${CUDA_VERSION_MINOR}")
+  status("    CUDA_VERSION_STRING: ${CUDA_VERSION_STRING}")
+endif()
+if(OpenCV_FOUND)
+  status("  OpenCV_VERSION: ${OpenCV_VERSION}")
+  status("    OpenCV_VERSION_MAJOR: ${OpenCV_VERSION_MAJOR}")
+  status("    OpenCV_VERSION_MINOR: ${OpenCV_VERSION_MINOR}")
+  status("    OpenCV_VERSION_PATCH: ${OpenCV_VERSION_PATCH}")
+  status("    OpenCV_VERSION_TWEAK: ${OpenCV_VERSION_TWEAK}")
+  status("    OpenCV_VERSION_STATUS: ${OpenCV_VERSION_STATUS}")
+  status("    OpenCV_WITH_WORLD: ${WITH_OPENCV_WORLD}")
+endif()
+if(mynteye_VERSION)
+  status("  MYNTEYE_VERSION: ${mynteye_VERSION}")
+  status("    MYNTEYE_VERSION_MAJOR: ${mynteye_VERSION_MAJOR}")
+  status("    MYNTEYE_VERSION_MINOR: ${mynteye_VERSION_MINOR}")
+  status("    MYNTEYE_VERSION_PATCH: ${mynteye_VERSION_PATCH}")
+  status("    MYNTEYE_VERSION_TWEAK: ${mynteye_VERSION_TWEAK}")
+endif()
+
+status("")
+status("Options:")
+status("  WITH_API: ${WITH_API}")
+if(WITH_API)
+  if(OpenCV_FOUND)
+    status("    OpenCV: YES")
+    status("    OpenCV_VERSION: ${OpenCV_VERSION}")
+    status("    OpenCV_WORLD: " IF WITH_OPENCV_WORLD "YES" ELSE "NO")
+  else()
+    status("    OpenCV: NO")
+  endif()
+endif()
+
+status("  WITH_DEVICE_INFO_REQUIRED: ${WITH_DEVICE_INFO_REQUIRED}")
+
+status("  WITH_BOOST: ${WITH_BOOST}")
+if(WITH_BOOST)
+  if(Boost_FOUND)
+    status("    Boost: YES")
+    status("    Boost_VERSION: ${Boost_VERSION_STRING}")
+    #status("    Boost_LIBRARIES: ${Boost_LIBRARIES}")
+  else()
+    status("    Boost: NO")
+  endif()
+endif()
+
+status("  WITH_GLOG: ${WITH_GLOG}")
+if(WITH_GLOG)
+  if(glog_FOUND)
+    status("    glog: YES")
+    status("    glog_VERSION: ${glog_VERSION}")
+  else()
+    status("    glog: NO")
+  endif()
+endif()
+
+status("")
+status("Features:")
+status("  Filesystem: "
+  IF WITH_BOOST_FILESYSTEM "boost"
+  ELIF WITH_NATIVE_FILESYSTEM "native"
+  ELSE "none"
+)
+
+status("")
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -49,3 +49,88 @@ macro(make_executable NAME)
    endif()
  endif()
 endmacro()
+
+# set_default_value(VARIABLE DEFAULT)
+macro(set_default_value VARIABLE DEFAULT)
+  if(NOT ${VARIABLE})
+    set(${VARIABLE} ${DEFAULT})
+  endif()
+endmacro()
+
+# set_version_values(VARIABLE)
+macro(set_version_values VARIABLE)
+  string(REPLACE "." ";" __version_list "${${VARIABLE}}")
+  list(LENGTH __version_list __len)
+  if(${__len} GREATER 0)
+    list(GET __version_list 0 ${VARIABLE}_MAJOR)
+  endif()
+  if(${__len} GREATER 1)
+    list(GET __version_list 1 ${VARIABLE}_MINOR)
+  endif()
+  if(${__len} GREATER 2)
+    list(GET __version_list 2 ${VARIABLE}_PATCH)
+  endif()
+  if(${__len} GREATER 3)
+    list(GET __version_list 3 ${VARIABLE}_TWEAK)
+  endif()
+endmacro()
+
+# status(TEXT [IF cond text [ELIF cond text] [ELSE cond text]])
+macro(status TEXT)
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs IF ELIF ELSE)
+  cmake_parse_arguments(THIS "${options}" "${oneValueArgs}"
+                        "${multiValueArgs}" ${ARGN})
+
+  #message(STATUS "TEXT: ${TEXT}")
+  #message(STATUS "THIS_IF: ${THIS_IF}")
+  #message(STATUS "THIS_ELIF: ${THIS_ELIF}")
+  #message(STATUS "THIS_ELSE: ${THIS_ELSE}")
+
+  set(__msg_list "${TEXT}")
+  set(__continue TRUE)
+
+  if(__continue AND DEFINED THIS_IF)
+    #message(STATUS "-- THIS_IF: ${THIS_IF}")
+    list(LENGTH THIS_IF __if_len)
+    if(${__if_len} GREATER 1)
+      list(GET THIS_IF 0 __if_cond)
+      if(${__if_cond})
+        list(REMOVE_AT THIS_IF 0)
+        list(APPEND __msg_list ${THIS_IF})
+        set(__continue FALSE)
+      endif()
+    else()
+      message(FATAL_ERROR "status() IF must have cond and text, >= 2 items")
+    endif()
+  endif()
+
+  if(__continue AND DEFINED THIS_ELIF)
+    #message(STATUS "-- THIS_ELIF: ${THIS_ELIF}")
+    list(LENGTH THIS_ELIF __elif_len)
+    if(${__elif_len} GREATER 1)
+      list(GET THIS_ELIF 0 __elif_cond)
+      if(${__elif_cond})
+        list(REMOVE_AT THIS_ELIF 0)
+        list(APPEND __msg_list ${THIS_ELIF})
+        set(__continue FALSE)
+      endif()
+    else()
+      message(FATAL_ERROR "status() ELIF must have cond and text, >= 2 items")
+    endif()
+  endif()
+
+  if(__continue AND DEFINED THIS_ELSE)
+    #message(STATUS "-- THIS_ELSE: ${THIS_ELSE}")
+    list(LENGTH THIS_ELSE __else_len)
+    if(${__else_len} GREATER 0)
+      list(APPEND __msg_list ${THIS_ELSE})
+    else()
+      message(FATAL_ERROR "status() ELSE must have text, >= 1 items")
+    endif()
+  endif()
+
+  string(REPLACE ";" "" __msg_list "${__msg_list}")
+  message(STATUS "${__msg_list}")
+endmacro()
--- a/cmake/templates/pkginfo.sh.in
+++ b/cmake/templates/pkginfo.sh.in
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+OpenCV_VERSION=@OpenCV_VERSION@
+OpenCV_VERSION_MAJOR=@OpenCV_VERSION_MAJOR@
+OpenCV_VERSION_MINOR=@OpenCV_VERSION_MINOR@
+OpenCV_VERSION_PATCH=@OpenCV_VERSION_PATCH@
+OpenCV_VERSION_STATUS=@OpenCV_VERSION_STATUS@
+
+_contains() {
+  [ `echo $1 | grep -c "$2"` -gt 0 ]
+}
+
+if _contains "@OpenCV_INCLUDE_DIRS@" "/ros/"; then
+  ROS_VERSION=$(rosversion -d)
+  OpenCV_VERSION=ros-$ROS_VERSION
+fi