Commit 2d8c939b authored by Samuel Debionne's avatar Samuel Debionne

Merge branch '57-zwo-camera-plugin' into 'master'

Resolve "ZWO camera plugin"

Closes #57

See merge request !77
parents 01d492ba 4f689c80
......@@ -124,3 +124,6 @@
[submodule "camera/fli"]
path = camera/fli
url = ../Lima-camera-fli
[submodule "camera/zwo"]
path = camera/zwo
url = ../Lima-camera-zwo
Subproject commit 3b47f02ff4887ea387b4c82e0ebe799c35077718
......@@ -359,6 +359,16 @@ if(UNIX)
if(LIMACAMERA_XSPRESS3)
add_subdirectory(camera/xspress3)
endif(LIMACAMERA_XSPRESS3)
#ZWO
if(DEFINED ENV{LIMACAMERA_ZWO})
set(LIMACAMERA_ZWO "$ENV{LIMACAMERA_ZWO}" CACHE BOOL "compile zwo ?" FORCE)
else()
set(LIMACAMERA_ZWO OFF CACHE BOOL "compile zwo ?")
endif()
if(LIMACAMERA_ZWO)
add_subdirectory(camera/zwo)
endif(LIMACAMERA_ZWO)
endif()
#CAMERA ONLY WORKING ON WINDOWS
......
......@@ -29,9 +29,9 @@ Linux Only
Dectris Mythen 3 <camera/mythen3/doc/index>
Dectris Pilatus 2 & 3 <camera/pilatus/doc/index>
ImXpad <camera/imxpad/doc/index>
PointGrey <camera/pointgrey/doc/index>
Merlin <camera/merlin/doc/index>
Pixirad <camera/pixirad/doc/index>
PointGrey <camera/pointgrey/doc/index>
Prosilica <camera/prosilica/doc/index>
Rayonix MarCCD <camera/marccd/doc/index>
Rayonix HS <camera/rayonixhs/doc/index>
......@@ -42,6 +42,7 @@ Linux Only
Xpad <camera/xpad/doc/index>
Xspress3 <camera/xspress3/doc/index>
Xh <camera/xh/doc/index>
Zwo <camera/zwo/doc/index>
Windows and Linux
==================
......
......@@ -55,6 +55,7 @@ LIMACAMERA_FRELON=0
LIMACAMERA_LAMBDA=0
LIMACAMERA_SLSDETECTOR=0
LIMACAMERA_FLI=0
LIMACAMERA_ZWO=0
LIMA_ENABLE_CBF=0
LIMA_ENABLE_NXS=0
LIMA_ENABLE_FITS=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment