File use_system_libs.patch of Package phd2

Overview Repositories Revisions Requests Users Attributes Meta

File use_system_libs.patch of Package phd2

--- phd2/thirdparty/thirdparty.cmake	2024-05-30 09:13:02.337848893 +0200
+++ phd2-2.6.13dev4/thirdparty/thirdparty.cmake	2024-05-30 09:24:49.308494420 +0200
@@ -714,21 +714,6 @@
   )
 endif()
 
-if (NOT OPENSOURCE_ONLY)
-  include(FetchContent)
-  FetchContent_Declare(
-    OGMAcamSDK
-    GIT_REPOSITORY https://github.com/OGMAvision/OGMAcamSDK.git
-    GIT_TAG be02a7317194e28e5b4f5f0d735eae729d096752
-  )
-  FetchContent_MakeAvailable(OGMAcamSDK)
-  include_directories(${ogmacamsdk_SOURCE_DIR}/inc)
-  if (WIN32)
-    list(APPEND PHD_LINK_EXTERNAL ${ogmacamsdk_SOURCE_DIR}/win/x86/ogmacam.lib)
-    list(APPEND PHD_COPY_EXTERNAL_ALL ${ogmacamsdk_SOURCE_DIR}/win/x86/ogmacam.dll)
-  endif()
-endif()
-
 # Various camera libraries
 if(WIN32)
   # Video for Windows, directshow and windows media
@@ -1008,9 +993,7 @@
     # when building for FreeBSD.
     if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
       find_library(asiCamera2
-             NAMES ASICamera2
-             NO_DEFAULT_PATHS
-             PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch})
+             NAMES ASICamera2)
 
       if(NOT asiCamera2)
         message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
@@ -1020,10 +1003,7 @@
       set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
 
       find_library(toupcam
-             NAMES toupcam
-             NO_DEFAULT_PATHS
-             NO_CMAKE_SYSTEM_PATH
-             PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/toupcam/linux/${toupcam_arch})
+             NAMES toupcam)
       if(NOT toupcam)
         message(FATAL_ERROR "Cannot find the toupcam drivers")
       endif()
@@ -1033,10 +1013,7 @@
       set(PHD_INSTALL_LIBS ${PHD_INSTALL_LIBS} ${toupcam})
 
       find_library(ogmacam
-             NAMES ogmacam
-             NO_DEFAULT_PATHS
-             NO_CMAKE_SYSTEM_PATH
-             PATHS ${ogmacamsdk_SOURCE_DIR}/linux/${toupcam_arch})
+             NAMES ogmacam)
       if(NOT ogmacam)
         message(FATAL_ERROR "Cannot find the ogmacam drivers")
       endif()
@@ -1046,9 +1023,7 @@
       set(PHD_INSTALL_LIBS ${PHD_INSTALL_LIBS} ${ogmacam})
 
       find_library(SVBCameraSDK
-            NAMES SVBCameraSDK
-            NO_DEFAULT_PATHS
-            PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/svblibs/linux/${svbony_arch})
+            NAMES SVBCameraSDK)
 
       if(NOT SVBCameraSDK)
         message(FATAL_ERROR "Cannot find the SVBCameraSDK drivers")
@@ -1058,19 +1033,14 @@
       set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${SVBCameraSDK})
       set(PHD_INSTALL_LIBS ${PHD_INSTALL_LIBS} ${SVBCameraSDK})
 
-      if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-        add_definitions(-DHAVE_QHY_CAMERA=1)
-
-        # be careful not to pick up any other qhy lib on the system
-        find_library(qhylib
-               NAMES qhyccd
-               NO_DEFAULT_PATH
-               PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-        if(NOT qhylib)
-          message(FATAL_ERROR "Cannot find the qhy SDK libs")
-        endif()
-          set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
+      find_library(qhylib
+             NAMES qhyccd)
+      if(NOT qhylib)
+        message(FATAL_ERROR "Cannot find the qhy SDK libs")
       endif()
+      message(STATUS "Found QHY lib ${qhylib}")
+      add_definitions(-DHAVE_QHY_CAMERA=1)
+      set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
     endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 
     find_program(LSB_RELEASE_EXEC lsb_release)

Places

File use_system_libs.patch of Package phd2

Places