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

Resolve "Generate conda packages"

Closes #16

See merge request !65

.gitlab-ci.yml

-# image : docker-registry.esrf.fr/bcu/lima-ci-debian8:latest
-#before_script :
-
 stages:
   - build
-  - test
+  - deploy
 
-build-python2 :
+build-conda-linux:
   stage: build
   script:
-    - update-alternatives --set python /usr/bin/python2.7
-    - ./install.sh --git tests python
-    - ls -l
+    - conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
   artifacts:
     paths:
-    - build/
+      - dist/
   tags:
-    - lima
+    - conda
+    - linux
 
-build-python3 :
+build-conda-win:
   stage: build
   script:
-    - update-alternatives --set python /usr/bin/python3.4
-    - ./install.sh --git tests python
-    - ls -l
+    #- conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+    - docker run --mount type=bind,source="%CD%",target="C:\sources" docker-registry.esrf.fr/bcu/conda-builder-win cmd /K cd C:\sources ^& conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
   artifacts:
     paths:
-    - build/
+      - dist/
   tags:
-    - lima
-
-
-test-python2 :
-  stage: test
-  dependencies:
-    - build-python2
-  script:
-    - update-alternatives --set python /usr/bin/python2.7
-    - cd build/
-    - ctest --timeout 10 --output-on-failure
-  tags:
-    - lima
-
+    - conda
+    - win
+    - shell
 
-test-python3 :
-  stage: test
+deploy:
+  stage: deploy
+  environment:
+    name: production
+    url: http://bcu-ci.esrf.fr/stable
   dependencies:
-    - build-python3
+    - build-conda-linux
+    - build-conda-win
   script:
-    - update-alternatives --set python /usr/bin/python3.4
-    - cd build/
-    - ctest --timeout 10 --output-on-failure
+    - mv -Rf dist/* /conda/
+    - conda index /conda/
   tags:
-    - lima
+    - conda
+    - linux
+  when: manual

CMakeLists.txt

@@ -5,19 +5,19 @@
 #  European Synchrotron Radiation Facility
 #  BP 220, Grenoble 38043
 #  FRANCE
-# 
+#
 #  Contact: lima@esrf.fr
-# 
+#
 #  This is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
-# 
+#
 #  This software is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ############################################################################
@@ -32,13 +32,18 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #--------------------------------------------------------------------------------
-# cmake/ directory contains tools 
+# cmake/ directory contains tools
 #--------------------------------------------------------------------------------
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 include(LimaTools)
 
 find_package(Threads REQUIRED)
 
+if(MSVC AND MSVC_VERSION GREATER 1500)
+  # Compiler specific (parallel build)
+  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} /MP")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
 
 if(UNIX)
 #--------------------------------------------------------------------------------
@@ -49,7 +54,7 @@ if(UNIX)
   else()
     option(LIMA_ENABLE_SPS_IMAGE "compile sps_image?" OFF)
   endif()
-  
+
 # openGL real-time display
   if(DEFINED ENV{COMPILE_GLDISPLAY})
     set(LIMA_ENABLE_GLDISPLAY "$ENV{COMPILE_GLDISPLAY}" CACHE BOOL "compile gldisplay?" FORCE)
@@ -71,7 +76,7 @@ if(DEFINED ENV{LIMA_ENABLE_CONFIG})
 else()
     option(LIMA_ENABLE_CONFIG "compile with libconfig?" OFF)
 endif()
-      
+
 #--------------------------------------------------------------------------------
 # Saving formats can be enabled from environment variables using config.inc file
 #--------------------------------------------------------------------------------
@@ -95,7 +100,7 @@ if(UNIX)
 	if(DEFINED ENV{LIMA_ENABLE_NXS})
 		set(LIMA_ENABLE_NXS "$ENV{LIMA_ENABLE_NXS}" CACHE BOOL "compile Nexus saving code?" FORCE)
 	else()
-		option(LIMA_ENABLE_NXS "compile Nexus saving code?" OFF) 
+		option(LIMA_ENABLE_NXS "compile Nexus saving code?" OFF)
 	endif()
 	if(DEFINED ENV{LIMA_ENABLE_TIFF})
 		set(LIMA_ENABLE_TIFF "$ENV{LIMA_ENABLE_TIFF}" CACHE BOOL "compile TIFF saving code?" FORCE)
@@ -142,26 +147,28 @@ if(LIMA_ENABLE_PYTHON)
     if(${PYTHONINTERP_FOUND})
       # python site-packages folder
       execute_process(
-	      COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
-	OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-	else()
-		message(FATAL_ERROR "No python found, please install or disable LIMA_ENABLE_PYTHON")
+        COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
+        OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+  	else()
+  		message(FATAL_ERROR "No python found, please install or disable LIMA_ENABLE_PYTHON")
     endif()
-    find_package(SIP)
-	if(${SIP_FOUND})
-		include(SIPMacros)
-	else()
-		message(FATAL_ERROR "python SIP not installed, please install or disable LIMA_ENABLE_PYTHON")
-	endif()
 
     set(PYTHON_SITE_PACKAGES_DIR ${_PYTHON_SITE_PACKAGES_DIR} CACHE PATH "where should python modules be installed?")
 
-    set(NUMPY_INCLUDE_DIR "${_PYTHON_SITE_PACKAGES_DIR}/numpy/core/include" CACHE PATH "Path to NumPy include folder")
-    set(NUMPY_LIB_DIR "${_PYTHON_SITE_PACKAGES_DIR}/numpy/core/lib" CACHE PATH "Path to NumPy lib folder")
-    include_directories(${NUMPY_INCLUDE_DIR})
-    link_directories(${NUMPY_LIB_DIR})
-    if(!${SIP_FOUND})
-        message(FATAL_ERROR "sip executable not found, cannot build python extensions")
+    find_package(SIP)
+  	if(${SIP_FOUND})
+  		include(SIPMacros)
+  	else()
+  		message(FATAL_ERROR "python SIP not installed, please install or disable LIMA_ENABLE_PYTHON")
+  	endif()
+
+    find_package(NumPy)
+    if(${NUMPY_FOUND})
+      include_directories(${NUMPY_INCLUDE_DIRS})
+      link_directories(${NUMPY_LIBRARIES})
+    else()
+        message(FATAL_ERROR "NumPy not found, cannot build python extensions")
     endif()
     if(WIN32)
         set(SIP_TAGS WIN32_PLATFORM)
@@ -240,7 +247,7 @@ if(LIMA_ENABLE_CONFIG)
 			endif()
 		else()
 			message(FATAL_ERROR "This compiler is not supported: " ${CMAKE_GENERATOR})
-		endif()		
+		endif()
 		set(LIB_CONFIG_INCLUDE_DIR "C:/Program Files/LIBCONFIG-windows/${CONFIG_VERSION}/include" CACHE PATH "Path to LIBCONFIG++ includes")
 		set(LIB_CONFIG_DIR "C:/Program Files/LIBCONFIG-windows/${CONFIG_VERSION}/lib" CACHE PATH "Path to LIBCONFIG++ lib folder")
 		find_library(LIB_CONFIG libconfig++ ${LIB_CONFIG_DIR})
@@ -248,7 +255,7 @@ if(LIMA_ENABLE_CONFIG)
 		find_library(LIB_CONFIG config++)
 	endif()
 	find_path(LIB_CONFIG_INCLUDE_DIR libconfig.h++)
-	
+
 	include(FindPackageHandleStandardArgs)
 	find_package_handle_standard_args(config DEFAULT_MSG LIB_CONFIG LIB_CONFIG_INCLUDE_DIR)
 	if(${CONFIG_FOUND})
@@ -280,150 +287,103 @@ endif()
 set(saving_libs)
 set(saving_includes)
 if(LIMA_ENABLE_EDFGZ)
-	if(WIN32)
-		if (${CMAKE_GENERATOR} MATCHES "Win64$")
-			set(ZLIB_ARCH "win64")
-		else()
-			set(ZLIB_ARCH "win32")
-		endif()	
-		set(LIB_ZLIB_INCLUDE_DIR "C:/Program Files/zlib-windows/${ZLIB_ARCH}/include" CACHE PATH "Path to zlib includes")
-		set(LIB_ZLIB_DIR "C:/Program Files/zlib-windows/${ZLIB_ARCH}/lib" CACHE PATH "Path to zlib libs")
-		link_directories(${LIB_ZLIB_DIR})
-		find_library(LIB_ZLIB zlibstatic ${LIB_ZLIB_DIR})
-		add_definitions(-DZLIB_WINAPI)
-	else()
-	    find_library(LIB_ZLIB z)
-	endif()	
-	find_path(LIB_ZLIB_INCLUDE_DIR zlib.h)
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(ZLIB DEFAULT_MSG LIB_ZLIB LIB_ZLIB_INCLUDE_DIR)
+  find_package(ZLIB)
 	if(${ZLIB_FOUND})
 		add_definitions(-DWITH_Z_COMPRESSION)
-		set(saving_libs ${saving_libs} ${LIB_ZLIB})
-		set(saving_includes ${saving_includes} ${LIB_ZLIB_INCLUDE_DIR})		
+		set(saving_libs ${saving_libs} ${ZLIB_LIBRARIES})
+		set(saving_includes ${saving_includes} ${ZLIB_INCLUDE_DIRS})
 	else()
 		message(FATAL_ERROR "ZLIB library not found, please install or disable LIMA_ENABLE_EDFGZ")
-	endif()	
+	endif()
 endif()
 
 if(LIMA_ENABLE_EDFLZ4)
-    # look for a lz4  1.7 where lz4frame.h was added
-    find_path(LIB_LZ4_INCLUDE_DIR lz4frame.h)
-    find_library(LIB_LZ4 NAMES lz4)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(LZ4 DEFAULT_MSG LIB_LZ4 LIB_LZ4_INCLUDE_DIR)
-    if (LZ4_FOUND)
+    find_package(LZ4)
+    if (${LZ4_FOUND})
         add_definitions(-DWITH_LZ4_COMPRESSION)
-        set(saving_libs ${saving_libs} ${LIB_LZ4})
-	set(saving_includes ${saving_includes} ${LIB_LZ4_INCLUDE_DIR})		
+        set(saving_libs ${saving_libs} ${LZ4_LIBRARIES})
+      	set(saving_includes ${saving_includes} ${LZ4_INCLUDE_DIRS})
     else()
-        message(FATAL_ERROR "LZ4 library: required version = 1.7.x, please update or switch off LIMA_ENABLE_EDFLZ4")
+        message(FATAL_ERROR "LZ4 library: required version = 1.8.2, please update or switch off LIMA_ENABLE_EDFLZ4")
     endif()
 endif()
 
 if(LIMA_ENABLE_CBF)
-	find_path(LIB_CBF_INCLUDE_DIR cbf/cbf.h)
-    find_library(LIB_CBF cbf)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(CBF DEFAULT_MSG LIB_CBF LIB_CBF_INCLUDE_DIR)
+  find_package(CBF)
 	if (${CBF_FOUND})
 		add_definitions(-DWITH_CBF_SAVING)
 		add_definitions(-DPROTOTYPES)
 		set(ct_srcs ${ct_srcs} control/src/CtSaving_Cbf.cpp)
-		set(saving_libs ${saving_libs} ${LIB_CBF} crypto)
-		set(saving_includes ${saving_includes} ${LIB_CBF_INCLUDE_DIR})		
+		set(saving_libs ${saving_libs} ${CBF_LIBRARIES} crypto)
+		set(saving_includes ${saving_includes} ${CBF_INCLUDE_DIRS})
 	else()
 		message(FATAL_ERROR "CBF library not found, please install or disable LIMA_ENABLE_CBF")
-	endif()		
+	endif()
 endif()
 
 if(LIMA_ENABLE_FITS)
-    find_path(LIB_FITS_INCLUDE_DIR CCfits/CCfits.h)
-    find_library(LIB_CFITSIO cfitsio)
-    find_library(LIB_CCFITS CCfits)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(FITS DEFAULT_MSG LIB_CCFITS LIB_FITS_INCLUDE_DIR)
-	if(${FITS_FOUND})
+  find_package(CCFits)
+	if(${CCFITS_FOUND})
 		add_definitions(-DWITH_FITS_SAVING)
 		set(ct_srcs ${ct_srcs} control/src/CtSaving_Fits.cpp)
-		set(saving_libs ${saving_libs} ${LIB_CFITSIO} ${LIB_CCFITS})
-		set(saving_includes ${saving_includes} ${LIB_FITS_INCLUDE_DIR})		
+		set(saving_libs ${saving_libs} ${CFITSIO_LIBRARY} ${CCFITS_LIBRARY})
+		set(saving_includes ${saving_includes} ${CFITSIO_INCLUDE_DIR})
 	else()
-		message(FATAL_ERROR "CFITSIO and/or CCFITS library not found, please install or disable LIMA_ENABLE_FITS")	
+		message(FATAL_ERROR "CFITSIO and/or CCFITS library not found, please install or disable LIMA_ENABLE_FITS")
 	endif()
 endif()
 
 if(LIMA_ENABLE_HDF5)
-	if(WIN32)
-		if (${CMAKE_GENERATOR} MATCHES "2008")
-			set(HDF5_VERSION "1.8.13")
-		elseif (${CMAKE_GENERATOR} MATCHES "2015|2017")
-			set(HDF5_VERSION "1.8.20")
-		else()
-			message(FATAL_ERROR "Unsupported VS version for HDF5 saving format, only vs2008 or vs2015 are supported respectively for hdf5 1.8.13 and 1.8.16")
-		endif()
-		set(LIB_HDF5_INCLUDE_DIR "C:/Program Files/HDF_Group/HDF5/${HDF5_VERSION}/include" CACHE PATH "Path to HDF5 includes")
-		set(LIB_HDF5_DIR "C:/Program Files/HDF_Group/HDF5/${HDF5_VERSION}/lib" CACHE PATH "Path to HDF5 libs")
-		link_directories(${LIB_HDF5_DIR})
-		# we use static libs libhdf5.lib and libhdf5_cpp.lib
-		find_library(LIB_HDF5_CPP libhdf5_cpp ${LIB_HDF5_DIR})
-		find_library(LIB_HDF5 libhdf5 ${LIB_HDF5_DIR})
-		find_library(LIB_HDF5_HL libhdf5_hl ${LIB_HDF5_DIR})
-		find_library(LIB_ZLIB libzlib ${LIB_HDF5_DIR})
-		find_library(LIB_SZIP libszip ${LIB_HDF5_DIR})
-     else()
-        find_package(HDF5 REQUIRED COMPONENTS C CXX HL )
-	endif()	    
-    if(${HDF5_FOUND})        
-		add_definitions(-DWITH_HDF5_SAVING)
-		set(ct_srcs ${ct_srcs} control/src/CtSaving_Hdf5.cpp)	
-		set(saving_libs ${saving_libs} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${LIB_SZIP} ${LIB_ZLIB})
-		set(saving_includes ${saving_includes} ${HDF5_INCLUDE_DIRS})
-    else()
-		message(FATAL_ERROR "HDF5 libraries not found, please install or disable LIMA_ENABLE_HDF5")
-    endif()
+  #set (HDF5_USE_STATIC_LIBRARIES ON)
+  find_package(HDF5 COMPONENTS CXX HL)
+  if(${HDF5_FOUND})
+    add_definitions(-DWITH_HDF5_SAVING)
+    set(ct_srcs ${ct_srcs} control/src/CtSaving_Hdf5.cpp)	
+    set(saving_libs ${saving_libs} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${LIB_SZIP} ${LIB_ZLIB})
+    set(saving_includes ${saving_includes} ${HDF5_INCLUDE_DIRS})
+    set(saving_definitions ${saving_definitions} ${HDF5_DEFINITIONS})
+  else()
+    message(FATAL_ERROR "HDF5 library not found, please install or disable LIMA_ENABLE_HDF5")
+  endif()
 
-    if(LIMA_ENABLE_HDF5_BS)
-        set(BITSHUFFLE_EXTERNALLY_CONFIGURED ON)
-        add_subdirectory(control/bitshuffle)
+  if(LIMA_ENABLE_HDF5_BS)
+      set(BITSHUFFLE_EXTERNALLY_CONFIGURED ON)
+      add_subdirectory(control/bitshuffle)
 
-	add_definitions(-DWITH_BS_COMPRESSION)
-        set(saving_includes ${saving_includes} ${CMAKE_CURRENT_SOURCE_DIR}/third-party/bitshuffle/src)
-        set(saving_libs ${saving_libs} h5bshuf)
+      add_definitions(-DWITH_BS_COMPRESSION)
+      set(saving_includes ${saving_includes} ${CMAKE_CURRENT_SOURCE_DIR}/third-party/bitshuffle/src)
+      set(saving_libs ${saving_libs} h5bshuf)
 
-        # set(LIB_BS_INCLUDE_DIR "/usr/local/include/" CACHE PATH "Path to BitShuffle include files")
-        # link_directories(${LIB_HDF5_PLUGIN})
-        # find_library(LIB_HDF5_BS h5bshuf ${LIB_HDF5_PLUGIN})
-        # find_path(LIB_BS_INCLUDE_DIR bitshuffle.h)
-        # set(saving_libs ${saving_libs} ${LIB_HDF5_BS})
-        # set(saving_includes ${saving_includes} ${LIB_BS_INCLUDE_DIR})
-    endif()
+      # set(LIB_BS_INCLUDE_DIR "/usr/local/include/" CACHE PATH "Path to BitShuffle include files")
+      # link_directories(${LIB_HDF5_PLUGIN})
+      # find_library(LIB_HDF5_BS h5bshuf ${LIB_HDF5_PLUGIN})
+      # find_path(LIB_BS_INCLUDE_DIR bitshuffle.h)
+      # set(saving_libs ${saving_libs} ${LIB_HDF5_BS})
+      # set(saving_includes ${saving_includes} ${LIB_BS_INCLUDE_DIR})
+  endif()
 endif()
 
 if(LIMA_ENABLE_NXS)
-    find_path(LIB_NXS_INCLUDE_DIR nexuscpp/nexuscpp.h)
-    find_library(LIB_NXS nexuscpp)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(NXS DEFAULT_MSG LIB_NXS LIB_NXS_INCLUDE_DIR)		
+  find_path(LIB_NXS_INCLUDE_DIR nexuscpp/nexuscpp.h)
+  find_library(LIB_NXS nexuscpp)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(NXS DEFAULT_MSG LIB_NXS LIB_NXS_INCLUDE_DIR)
 	if(${NXS_FOUND})
-		add_definitions(-DWITH_NXS_SAVING)    
+		add_definitions(-DWITH_NXS_SAVING)
 		set(ct_srcs ${ct_srcs} control/src/CtSaving_NXS.cpp)
-		set(saving_includes ${saving_includes} ${LIB_NXS_INCLUDE_DIR})		
+		set(saving_includes ${saving_includes} ${LIB_NXS_INCLUDE_DIR})
 	else()
 		message(FATAL_ERROR "NEXUS cpp library not installed, please install or disable LIMA_ENABLE_NXS")
 	endif()
 endif()
 
 if(LIMA_ENABLE_TIFF)
-    find_path(LIB_TIFF_INCLUDE_DIR tiffio.h)
-    find_library(LIB_TIFF tiff)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(TIFF DEFAULT_MSG LIB_TIFF LIB_TIFF_INCLUDE_DIR)	
+  find_package(TIFF)
 	if(${TIFF_FOUND})
 		add_definitions(-DWITH_TIFF_SAVING)
 		set(ct_srcs ${ct_srcs} control/src/CtSaving_Tiff.cpp)
-		set(saving_libs ${saving_libs} tiff)
-		set(saving_includes ${saving_includes} ${LIB_TIFF_INCLUDE_DIR})		
+		set(saving_libs ${saving_libs} ${TIFF_LIBRARIES})
+		set(saving_includes ${saving_includes} ${TIFF_INCLUDE_DIRS})
 	else()
 		message(FATAL_ERROR "TIFF library not found, please install or disable LIMA_ENABLE_TIFF")
 	endif()
@@ -442,8 +402,8 @@ add_library(limacore SHARED
     ${control_incs}
 )
 
-limatools_set_library_soversion(limacore "common/VERSION")       
-  
+limatools_set_library_soversion(limacore "common/VERSION")
+
 target_include_directories(limacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/common/include")
 target_include_directories(limacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/hardware/include")
 target_include_directories(limacore PUBLIC
@@ -459,6 +419,9 @@ endif()
 # add all include paths coming from saving format options
 target_include_directories(limacore PRIVATE ${extra_includes} ${saving_includes})
 
+# add compiler definitions required by saving libraries
+target_compile_definitions(limacore PRIVATE ${saving_definitions})
+
 if(THREADS_HAVE_PTHREAD_ARG)
     target_compile_options(PUBLIC limacore "-pthread")
 endif()
@@ -482,12 +445,14 @@ if(WIN32)
 endif()
 if(WIN32)
     install(TARGETS limacore
-            DESTINATION lib
+            LIBRARY DESTINATION lib
+            RUNTIME DESTINATION bin
             PUBLIC_HEADER DESTINATION include)
 else()
+    include(GNUInstallDirs)
     install(TARGETS limacore
-            LIBRARY DESTINATION lib
-            PUBLIC_HEADER DESTINATION include)
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 endif()
 
 
@@ -535,7 +500,7 @@ if(LIMA_ENABLE_PYTHON)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/sip/core/limacore.sip PROPERTIES OBJECT_DEPENDS ${sipfiles} sip/core/HwFrameInfo.sip)
     # Run sip now !
     add_sip_python_module(limacore ${CMAKE_CURRENT_BINARY_DIR}/sip/core/limacore.sip)
-    
+
     target_include_directories(python_module_limacore PRIVATE
         ${PYTHON_INCLUDE_DIRS}
         ${CMAKE_CURRENT_SOURCE_DIR}/sip

andor @ 735ba784

-Subproject commit e148a266a6689e9e1e5545a842e2f6ac6cc443c3
+Subproject commit 735ba784e07b37fb991b49a00d20e346e7f6ad1a

andor3 @ 05fa3370

-Subproject commit 019824712a193bf67dac59f54551d8414f794f4c
+Subproject commit 05fa3370c45bee7c164b16b104d43b13d6eb6e21

basler @ 20d7f4a7

-Subproject commit 61ddfec995ab3ac369e12d2f20f78912d3b09502
+Subproject commit 20d7f4a75ac5b65daf51af314fa18e7432d8af3b

espia @ 085e3a54

-Subproject commit 448222e1f64eb92292407cf7ea5d5d7f79933abf
+Subproject commit 085e3a547e77490b7490dbf6168bec5754efd71f

frelon @ d42cb143

-Subproject commit 2f3a081b6090bd4633d5bff8209c7f14065c9181
+Subproject commit d42cb143f59be0fe1bdd355931b1d057fd3869c8

maxipix @ 861cbc2c

-Subproject commit 491b097a012c29168e3a097f937c42ddd398f88e
+Subproject commit 861cbc2cbd575a9b23e95b5352ed7474920e4f86

pco @ 9da79623

-Subproject commit 7d5e257a0f1e706a3b11619877c9ec50381d15ca
+Subproject commit 9da796236f7ce98add5dd5e28cab016c3076e6ac

pilatus @ 7688e5ca

-Subproject commit 0a26b61f31d41c60a6b45385279f889f7791d2d4
+Subproject commit 7688e5cae953891f4f91c5ca17801fd73dd69bdf

prosilica @ ce22fdaf

-Subproject commit dda475da96948630f05bf41d3dcb4c694fbcb869
+Subproject commit ce22fdafa85cbebf9da81815e6f68b52a015a25b

camera/simulator/CMakeLists.txt

@@ -5,19 +5,19 @@
 #  European Synchrotron Radiation Facility
 #  BP 220, Grenoble 38043
 #  FRANCE
-# 
+#
 #  Contact: lima@esrf.fr
-# 
+#
 #  This is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
-# 
+#
 #  This software is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, see <http://www.gnu.org/licenses/>.
 ############################################################################
@@ -36,16 +36,8 @@ target_link_libraries(lima${NAME} limacore)
 if(WIN32)
 	target_compile_definitions(lima${NAME} PRIVATE LIBSIMULATOR_EXPORTS)
 endif()
-if(WIN32)
-    set_target_properties(lima${NAME} PROPERTIES PREFIX "lib")
-endif()
-if(WIN32)
-    install(TARGETS lima${NAME}
-            DESTINATION lib)
-else()
-    install(TARGETS lima${NAME}
-            LIBRARY DESTINATION lib)
-endif()
+
+limatools_set_install_libdir(lima${NAME})
 
 if (LIMA_ENABLE_PYTHON)
     limatools_run_sip_for_camera(${NAME})

v4l2 @ 1752063b

-Subproject commit 89f71186c51652daff86a08a0363b58a8818733d
+Subproject commit 1752063b4dc51c930c06437c30fe98907d32917b

cmake/FindCBF.cmake

+find_path(CBF_INCLUDE_DIRS cbflib/cbf.h)
+find_library(CBF_LIBRARIES cbf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CBF
+  DEFAULT_MSG
+  CBF_LIBRARIES
+  CBF_INCLUDE_DIRS)

cmake/FindCCFits.cmake

+# -- Check for CFITSIO and CCFITS library --
+#
+# Uses path overrides: CFITSIOINC_PATH and CFITSIOLIB_PATH
+#
+# Defines:
+#
+#  CFITSIO_FOUND - system has the CFITSIO library
+#  CFITSIO_INCLUDE_DIR - the CFITSIO include directory
+#  CFITSIO_LIBRARY - The library needed to use CFITSIO
+#
+#  CCFITS_FOUND
+#  CCFITS_INCLUDE_DIR
+#  CCFITS_LIBRARY
+#
+# Hints for non-standard locations:
+#
+#   CFITSIO_ROOT_DIR  (used for finding cfitsio only)
+#   CCFITS_ROOT_DIR (used for finding CCfits only)
+#   BASE_DIR (used for both, and other dependencies as well)
+#
+# These directories can be the --prefix=<dir> directory or the
+# individual source directories for cfitsio or ccfits.
+#
+#   Copyright 2012  Jacek Becla, Daniel Liwei Wang
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+include(FindPackageHandleStandardArgs)
+
+# Look for includes and libraries
+find_path(CFITSIO_INCLUDE_DIR
+  NAMES fitsio.h
+  HINTS ${CFITSIO_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES include include/cfitsio
+  )
+find_library(CFITSIO_LIBRARY  cfitsio
+  HINTS ${CFITSIO_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES lib)
+
+find_package_handle_standard_args(CFITSIO  DEFAULT_MSG
+  CFITSIO_INCLUDE_DIR CFITSIO_LIBRARY)
+if(NOT CFITSIO_FOUND)
+  message("Can't find CCfits. You can specify a non-standard (e.g., from source) installation using CFITSIO_ROOT_DIR")
+endif(NOT CFITSIO_FOUND)
+
+
+
+find_path(CCFITS_INCLUDE_DIR  CCfits/CCfits
+  HINTS ${CCFITS_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES include)
+find_library(CCFITS_LIBRARY  CCfits
+  HINTS ${CCFITS_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES lib)
+find_package_handle_standard_args(CCFITS  DEFAULT_MSG
+  CCFITS_INCLUDE_DIR CCFITS_LIBRARY)
+
+if(NOT CCFITS_FOUND)
+  message("Can't find CCfits. You can specify a non-standard (e.g., from source) installation using CCFITS_ROOT_DIR")
+endif(NOT CCFITS_FOUND)
+
+#find_package_handle_standard_args(LIBSZ  DEFAULT_MSG  SZ_LIB)
+
+mark_as_advanced(CFITSIO_LIBRARY CFITSIO_INCLUDE_DIR
+  CCFITS_LIBRARY CCFITS_INCLUDE_DIR)

cmake/FindLZ4.cmake

+find_path(LZ4_INCLUDE_DIRS NAMES lz4.h)
+find_library(LZ4_LIBRARIES NAMES lz4)
+
+# We require LZ4_compress_default() which was added in v1.8.2
+if (LZ4_LIBRARIES)
+  include(CheckCSourceRuns)
+  set(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIRS})
+  set(CMAKE_REQUIRED_LIBRARIES ${LZ4_LIBRARY})
+