diff --git a/CMakeLists.txt b/CMakeLists.txt index 22cdc019..41ff3fc3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() # ---------------------------------------------------------------------------- -# Build +# Include necessary CMake modules # ---------------------------------------------------------------------------- # RMVL Install layout include(cmake/RMVLInstall.cmake) diff --git a/cmake/FindHikSDK.cmake b/cmake/FindHikSDK.cmake index aa33783c..863a40cc 100644 --- a/cmake/FindHikSDK.cmake +++ b/cmake/FindHikSDK.cmake @@ -6,7 +6,7 @@ endif() # add the include directories path find_path( - HikSDK_INCLUDE_DIRS + HikSDK_INCLUDE_DIR NAMES CameraParams.h MvCameraControl.h MvErrorDefine.h MvISPErrorDefine.h PixelType.h PATHS "${mvcam_sdk_path}/include" NO_DEFAULT_PATH @@ -28,15 +28,28 @@ else() endif() find_library( - HikSDK_LIBS + HikSDK_LIB NAMES "libMvCameraControl.so" PATHS "${mvcam_sdk_path}/lib/${ARCH_HIKLIB}" NO_DEFAULT_PATH ) +if(NOT TARGET hiksdk) + add_library(hiksdk SHARED IMPORTED) + set_target_properties(hiksdk PROPERTIES + IMPORTED_LOCATION "${HikSDK_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${HikSDK_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(HikSDK_LIB HikSDK_INCLUDE_DIR) + +set(HikSDK_LIBS "hiksdk") +set(HikSDK_INCLUDE_DIRS "${HikSDK_INCLUDE_DIR}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( HikSDK - REQUIRED_VARS HikSDK_LIBS HikSDK_INCLUDE_DIRS + REQUIRED_VARS HikSDK_LIB HikSDK_INCLUDE_DIR ) \ No newline at end of file diff --git a/cmake/FindMvSDK.cmake b/cmake/FindMvSDK.cmake index 1c5bded4..471221f4 100644 --- a/cmake/FindMvSDK.cmake +++ b/cmake/FindMvSDK.cmake @@ -1,6 +1,6 @@ # add the include directories path find_path( - MvSDK_INCLUDE_DIRS + MvSDK_INCLUDE_DIR NAMES CameraApi.h CameraDefine.h CameraStatus.h PATHS "/usr/include" NO_DEFAULT_PATH @@ -8,15 +8,28 @@ find_path( # add libraries find_library( - MvSDK_LIBS + MvSDK_LIB PATHS "/lib" NAMES "libMVSDK.so" NO_DEFAULT_PATH ) +if(NOT TARGET mvsdk) + add_library(mvsdk SHARED IMPORTED) + set_target_properties(mvsdk PROPERTIES + IMPORTED_LOCATION "${MvSDK_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${MvSDK_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(MvSDK_LIB MvSDK_INCLUDE_DIR) + +set(MvSDK_LIBS "mvsdk") +set(MvSDK_INCLUDE_DIRS "${MvSDK_INCLUDE_DIR}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( MvSDK - REQUIRED_VARS MvSDK_LIBS MvSDK_INCLUDE_DIRS + REQUIRED_VARS MvSDK_LIB MvSDK_INCLUDE_DIR ) diff --git a/cmake/FindOPTCameraSDK.cmake b/cmake/FindOPTCameraSDK.cmake index 08fd0b6d..0592ce2b 100644 --- a/cmake/FindOPTCameraSDK.cmake +++ b/cmake/FindOPTCameraSDK.cmake @@ -2,7 +2,7 @@ set(OPTCameraSDK_root_path "/opt/OPT/OPTCameraDemo") # add the include directories path find_path( - OPTCameraSDK_INCLUDE_DIRS + OPTCameraSDK_INCLUDE_DIR NAMES OPTApi.h OPTDefines.h PATHS "${OPTCameraSDK_root_path}/include" NO_DEFAULT_PATH @@ -10,15 +10,28 @@ find_path( # add libraries find_library( - OPTCameraSDK_LIBS + OPTCameraSDK_LIB NAMES "libOPTSDK.so" PATHS "${OPTCameraSDK_root_path}/lib" NO_DEFAULT_PATH ) +if(NOT TARGET optcamsdk) + add_library(optcamsdk SHARED IMPORTED) + set_target_properties(optcamsdk PROPERTIES + IMPORTED_LOCATION "${OPTCameraSDK_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${OPTCameraSDK_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(OPTCameraSDK_INCLUDE_DIR OPTCameraSDK_LIB) + +set(OPTCameraSDK_LIBS "optcamsdk") +set(OPTCameraSDK_INCLUDE_DIRS "${OPTCameraSDK_INCLUDE_DIR}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( OPTCameraSDK - REQUIRED_VARS OPTCameraSDK_LIBS OPTCameraSDK_INCLUDE_DIRS + REQUIRED_VARS OPTCameraSDK_LIB OPTCameraSDK_INCLUDE_DIR ) \ No newline at end of file diff --git a/cmake/FindOPTLightCtrl.cmake b/cmake/FindOPTLightCtrl.cmake index 60a7c649..48545302 100644 --- a/cmake/FindOPTLightCtrl.cmake +++ b/cmake/FindOPTLightCtrl.cmake @@ -2,7 +2,7 @@ set(OPTLightCtrl_root_path "/opt/OPT/OPTController") # add the include directories path find_path( - OPTLightCtrl_INCLUDE_DIRS + OPTLightCtrl_INCLUDE_DIR NAMES OPTController.h OPTErrorCode.h PATHS "${OPTLightCtrl_root_path}/include" NO_DEFAULT_PATH @@ -10,15 +10,28 @@ find_path( # add libraries find_library( - OPTLightCtrl_LIBS + OPTLightCtrl_LIB NAMES "libOPTController.so" PATHS "${OPTLightCtrl_root_path}/lib" NO_DEFAULT_PATH ) +if(NOT TARGET optlc) + add_library(optlc SHARED IMPORTED) + set_target_properties(optlc PROPERTIES + IMPORTED_LOCATION "${OPTLightCtrl_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${OPTLightCtrl_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(OPTLightCtrl_INCLUDE_DIR OPTLightCtrl_LIB) + +set(OPTLightCtrl_LIBS "optlc") +set(OPTLightCtrl_INCLUDE_DIRS "${OPTLightCtrl_INCLUDE_DIR}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( OPTLightCtrl - REQUIRED_VARS OPTLightCtrl_LIBS OPTLightCtrl_INCLUDE_DIRS + REQUIRED_VARS OPTLightCtrl_LIB OPTLightCtrl_INCLUDE_DIR ) \ No newline at end of file diff --git a/cmake/FindOrt.cmake b/cmake/FindOrt.cmake index 2845a5d3..5f2aa201 100755 --- a/cmake/FindOrt.cmake +++ b/cmake/FindOrt.cmake @@ -4,7 +4,7 @@ endif() # add the include directories path find_path( - Ort_INCLUDE_DIRS + Ort_INCLUDE_DIR PATHS "${ort_root_path}/include/onnxruntime" NAMES cpu_provider_factory.h onnxruntime_run_options_config_keys.h onnxruntime_c_api.h onnxruntime_session_options_config_keys.h @@ -15,15 +15,28 @@ find_path( # add libraries find_library( - Ort_LIBS + Ort_LIB NAMES "libonnxruntime.so" PATHS "${ort_root_path}/lib" NO_DEFAULT_PATH ) +if(NOT TARGET onnxruntime) + add_library(onnxruntime SHARED IMPORTED) + set_target_properties(onnxruntime PROPERTIES + IMPORTED_LOCATION "${Ort_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${Ort_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced(Ort_INCLUDE_DIR Ort_LIB) + +set(Ort_LIBS "onnxruntime") +set(Ort_INCLUDE_DIRS "${Ort_INCLUDE_DIR}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( Ort - REQUIRED_VARS Ort_LIBS Ort_INCLUDE_DIRS + REQUIRED_VARS Ort_LIB Ort_INCLUDE_DIR ) diff --git a/cmake/RMVLCompilerOptions.cmake b/cmake/RMVLCompilerOptions.cmake index 638e480d..1082f722 100755 --- a/cmake/RMVLCompilerOptions.cmake +++ b/cmake/RMVLCompilerOptions.cmake @@ -202,47 +202,6 @@ option(BUILD_EXTRA "Build extra modules containing 4 data components and 4 funct option(BUILD_EXAMPLES "Build RMVL all examples" ON) option(BUILD_DOCS "Create build rules for RMVL Documentation" OFF) -# ---------------------------------------------------------------------------- -# Add compile option -# Note: -# if the condition is met, set to the default value, otherwise set to the reverse value -# Usage: -# __rmvl_option(