Blob Blame History Raw
diff -U 3 -dHrN -- a/cameras.h b/cameras.h
--- a/cameras.h	2017-09-04 23:55:17.000000000 +0200
+++ b/cameras.h	2017-09-06 20:25:22.743663856 +0200
@@ -109,7 +109,7 @@
 #  define QHY_CAMERA
 # endif
 # define INDI_CAMERA
-# define ZWO_ASI
+//# define ZWO_ASI
 # define SXV
 # ifdef HAVE_SBIG_CAMERA
 #   define SBIG
diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
--- a/thirdparty/thirdparty.cmake	2017-09-26 00:21:15.000000000 +0200
+++ b/thirdparty/thirdparty.cmake	2017-11-02 19:04:42.283172290 +0100
@@ -1042,35 +1042,35 @@
     set(qhyarch "x86_32")
   endif()
  else()
-   message(FATAL_ERROR "unknown system architecture")
+   message(WARNING "unknown system architecture")
  endif()
 
-  find_path(ZWO_INCLUDE_DIR ASICamera2.h
-    PATHS
-    ${PHD_PROJECT_ROOT_DIR}/cameras
-  )
-
-  find_library(asiCamera2
-                NAMES ASICamera2
-                PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-  if(NOT asiCamera2)
-    message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-  endif()
-  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-
-  if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-    add_definitions(-DHAVE_QHY_CAMERA=1)
+#  find_path(ZWO_INCLUDE_DIR ASICamera2.h
+#    PATHS
+#    ${PHD_PROJECT_ROOT_DIR}/cameras
+#  )
+#
+#  find_library(asiCamera2
+#                NAMES ASICamera2
+#                PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
+#  if(NOT asiCamera2)
+#    message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
+#  endif()
+#  set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
+#
+#  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 qhy
-                  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})
-  endif()
+#    find_library( qhylib
+#                  NAMES qhy
+#                  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})
+#  endif()
 
   # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
   remove_definitions(-DHAVE_QHY_CAMERA=1)