Merge branch '16-generate-conda-packages' into 'master'

16 generate conda packages

See merge request !4

CMakeLists.txt

@@ -23,8 +23,6 @@
 ############################################################################
 set(NAME "pilatus")
 
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--add-needed")
-
 set(${NAME}_srcs src/PilatusCamera.cpp  src/PilatusInterface.cpp
 	 src/PilatusSaving.cpp)
 	 
@@ -36,10 +34,9 @@ target_include_directories(lima${NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inclu
 #LIBRARIES
 find_library(PILATUS_CBF_LIB cbf)
 if("${PILATUS_CBF_LIB}" STREQUAL "PILATUS_CBF_LIB-NOTFOUND")
-  message(FATAL_ERROR "${NAME} : libcbf not found, you can search it in cmake-gui or try to install it if it isn't here.")
+  message(FATAL_ERROR "${NAME} : CBF library not found, you can search it in cmake-gui or try to install it if it isn't here.")
 endif()
 
-
 target_link_libraries(lima${NAME} limacore)
 target_link_libraries(lima${NAME} ${PILATUS_CBF_LIB})
 

doc/index.rst

@@ -81,7 +81,7 @@ This is a python code example for a simple test:
 .. code-block:: python
 
   from Lima import Pilatus
-  from lima import Core
+  from Lima import Core
 
   cam = Pilatus.Camera()
   hwint = Pilatus.Interface(cam)
@@ -109,7 +109,7 @@ This is a python code example for a simple test:
 
   # now ask for 2 sec. exposure and 10 frames
   acq.setAcqExpoTime(2)
-  acq.setNbImages(10)
+  acq.setAcqNbFrames(10)
 
   ct.prepareAcq()
   ct.startAcq()

include/PilatusCamera.h

@@ -137,7 +137,7 @@ public:
     bool hasHighVoltageReset();
     void resetHighVoltage(unsigned int sleeptime = 1);
 private:
-    static const double             TIME_OUT = 10.;
+    static constexpr double             TIME_OUT = 10.;
     enum HIGH_VOLTAGE { NOT_INITIALIZED,
 			HAS_HIGH_VOLTAGE,DONT_HAVE_HIGH_VOLTAGE };
 

src/PilatusSaving.cpp

@@ -19,8 +19,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, see <http://www.gnu.org/licenses/>.
 //###########################################################################
-#include <cbf/cbf.h>
-#include <cbf/cbf_simple.h>
+#include <cbflib/cbf.h>
+#include <cbflib/cbf_simple.h>
 #include "PilatusSaving.h"
 #include "PilatusCamera.h"