Commit 3be37f37 authored by Laurent Claustre's avatar Laurent Claustre

Merge remote-tracking branch 'origin/cmake' into cmake_fli_camera

Conflicts:
	scripts/bootstrap.py
	scripts/config.txt_default
parents b9d1c256 1c45d2e6
Pipeline #2151 passed with stages
in 50 seconds
......@@ -191,7 +191,7 @@ set(common_srcs common/src/Constants.cpp common/src/SizeUtils.cpp common/src/Tim
common/src/DirectoryEventUtils.cpp common/src/SimplePipe.cpp)
if(WIN32)
list(REMOVE_ITEM common_srcs common/src/RegExUtils.cpp)
list(REMOVE_ITEM common_srcs common/src/RegExUtils.cpp common/src/SimplePipe.cpp)
endif()
set(hw_srcs hardware/src/HwInterface.cpp hardware/src/HwCap.cpp hardware/src/HwSyncCtrlObj.cpp hardware/src/HwFrameInfo.cpp
......
Subproject commit 22985ff59ec8400579e9a491c460cb8d2661a829
Subproject commit 8dd3f616d4225d849bbabe91475fd40b9a5aea36
......@@ -290,6 +290,16 @@ if(UNIX)
add_subdirectory(camera/rayonixhs)
endif(LIMACAMERA_RAYONIXHS)
#SLSDETECTOR
if(DEFINED ENV{LIMACAMERA_SLSDETECTOR})
set(LIMACAMERA_SLSDETECTOR "$ENV{LIMACAMERA_SLSDETECTOR}" CACHE BOOL "compile slsdetector ?" FORCE)
else()
set(LIMACAMERA_SLSDETECTOR OFF CACHE BOOL "compile slsdetector ?")
endif()
if(LIMACAMERA_SLSDETECTOR)
add_subdirectory(camera/slsdetector)
endif(LIMACAMERA_SLSDETECTOR)
#UEYE
if(DEFINED ENV{LIMACAMERA_UEYE})
set(LIMACAMERA_UEYE "$ENV{LIMACAMERA_UEYE}" CACHE BOOL "compile ueye ?" FORCE)
......@@ -349,7 +359,6 @@ if(UNIX)
if(LIMACAMERA_XSPRESS3)
add_subdirectory(camera/xspress3)
endif(LIMACAMERA_XSPRESS3)
endif()
#CAMERA ONLY WORKING ON WINDOWS
......
......@@ -99,7 +99,7 @@ macro(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
OUTPUT ${_sip_output_files}
COMMAND ${CMAKE_COMMAND} -E echo ${message}
COMMAND ${TOUCH_COMMAND} ${_sip_output_files}
COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${_module_path} ${_sip_includes} ${_abs_module_sip}
COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -b ${MODULE_NAME}.sbf -c ${_module_path} ${_sip_includes} ${_abs_module_sip}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/checksipexc.py ${_sip_output_files}
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
)
......
......@@ -169,7 +169,7 @@ if __name__ == '__main__':
OS_TYPE=platform.system()
del sys.argv[0]
not_submodule=('git', 'python', 'tests', 'test', 'cbf', 'lz4', 'fits', 'gz', 'tiff', 'hdf5')
camera_list=('adsc', 'andor3', 'basler', 'dexela', 'frelon', 'hexitec', 'marccd', 'merlin', 'mythen3', 'perkinelmer', 'pilatus', 'pointgrey', 'rayonixhs', 'ultra', 'xh', 'xspress3', 'andor', 'aviex', 'eiger', 'hamamatsu', 'imxpad', 'maxipix', 'mythen', 'pco', 'photonicscience','pixirad', 'prosilica', 'roperscientific', 'ueye', 'v4l2', 'xpad', 'fli')
camera_list=('adsc', 'andor3', 'basler', 'dexela', 'frelon', 'hexitec', 'marccd', 'merlin', 'mythen3', 'perkinelmer', 'pilatus', 'pointgrey', 'rayonixhs', 'ultra', 'xh', 'xspress3', 'andor', 'aviex', 'eiger', 'hamamatsu', 'imxpad', 'maxipix', 'mythen', 'pco', 'photonicscience','pixirad', 'prosilica', 'roperscientific', 'ueye', 'v4l2', 'xpad', 'lambda', 'slsdetector','fli')
install_path=""
install_python_path=""
find_root_path = ""
......
......@@ -52,6 +52,8 @@ LIMACAMERA_RAYONIXHS=0
LIMACAMERA_ESPIA=0
LIMACAMERA_MAXIPIX=0
LIMACAMERA_FRELON=0
LIMACAMERA_LAMBDA=0
LIMACAMERA_SLSDETECTOR=0
LIMACAMERA_FLI=0
LIMA_ENABLE_CBF=0
LIMA_ENABLE_NXS=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