File use_system_libs.patch of Package phd2

Overview Repositories Revisions Requests Users Attributes Meta

File use_system_libs.patch of Package phd2 (Revision 312973987b3396b7774126a06aa8ee04)

Currently displaying revision 312973987b3396b7774126a06aa8ee04 , Show latest

Index: phd2-2.6.12/thirdparty/thirdparty.cmake
===================================================================
--- phd2-2.6.12.orig/thirdparty/thirdparty.cmake
+++ phd2-2.6.12/thirdparty/thirdparty.cmake
@@ -1368,9 +1368,7 @@ if(UNIX AND NOT APPLE)
     # 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")
@@ -1380,22 +1378,16 @@ if(UNIX AND NOT APPLE)
       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()
       message(STATUS "Found toupcam lib ${toupcam}")
       add_definitions(-DHAVE_TOUPTEK_CAMERA=1)
       set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${toupcam})
-      set(PHD_INSTALL_LIBS ${PHD_INSTALL_LIBS} ${toupcam})
 
       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")
@@ -1405,19 +1397,14 @@ if(UNIX AND NOT APPLE)
       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 (Revision 312973987b3396b7774126a06aa8ee04)

Places