Commit acac0b14 authored by Aitor Henry's avatar Aitor Henry

Adding License message and deleting Makefiles.

Also update SIP compile, using CameraRunSIP.cmake.
parent f186d7e5
############################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-2017
# European Synchrotron Radiation Facility
# BP 220, Grenoble 38043
# FRANCE
#
# 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/>.
############################################################################
# CMakeLists.txt for Andor3 camera
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--add-needed")
......@@ -15,11 +36,12 @@ TARGET_INCLUDE_DIRECTORIES(limaandor3 PUBLIC "${COMMON_PATH}/include")
FIND_LIBRARY(ANDOR3_LIB_ATCORE atcore)
FIND_LIBRARY(ANDOR3_LIB_ATUTILITY atutility)
#FIND_LIBRARY(ANDOR3_LIB_ATCORE atcore ${COMMON_PATH}/lib)
#FIND_LIBRARY(ANDOR3_LIB_ATUTILITY atutility ${COMMON_PATH}/lib)
IF (("${ANDOR3_LIB_ATCORE}" STREQUAL "ANDOR3_LIB_ATCORE-NOTFOUND"))
MESSAGE(FATAL_ERROR "andor3 : libatcore not found, you can search it in cmake-gui or try to install it if it isn't here.")
ENDIF()
IF (("${ANDOR3_LIB_ATUTILITY}" STREQUAL "ANDOR3_LIB_ATUTILITY-NOTFOUND"))
MESSAGE(FATAL_ERROR "andor3 : libatutility not found, you can search it in cmake-gui or try to install it if it isn't here.")
ENDIF()
TARGET_LINK_LIBRARIES(limaandor3 limacore)
TARGET_LINK_LIBRARIES(limaandor3 ${ANDOR3_LIB_ATCORE})
TARGET_LINK_LIBRARIES(limaandor3 ${ANDOR3_LIB_ATUTILITY})
......@@ -30,33 +52,6 @@ INSTALL(TARGETS limaandor3 LIBRARY DESTINATION lib)
IF(COMPILE_SIP)
SET(NAME "andor3")
SET(INCLUDES)
FILE(GLOB sipfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/sip" "${CMAKE_CURRENT_SOURCE_DIR}/sip/*.sip")
FOREACH(sipfile ${sipfiles})
SET(INCLUDES
"${INCLUDES}
%Include ${sipfile}")
ENDFOREACH()
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sip/limamodules.sip.in sip/limaandor3.sip)
SET(SIP_CONCAT_PARTS 1)
SET(SIP_INCLUDES ${SIP_INCLUDES}
"${CMAKE_SOURCE_DIR}/third-party/Processlib/sip"
"${CMAKE_BINARY_DIR}/sip/core"
"${CMAKE_SOURCE_DIR}/third-party/Processlib/tasks/sip"
"${CMAKE_SOURCE_DIR}/common/sip"
"${CMAKE_SOURCE_DIR}/hardware/sip"
"${CMAKE_SOURCE_DIR}/control/sip"
"${CMAKE_SOURCE_DIR}/control/software_operation/sip"
"${CMAKE_CURRENT_SOURCE_DIR}/sip")
set(SIP_DISABLE_FEATURES WITH_CONFIG)
set(SIP_CHECK_EXC ON)
ADD_SIP_PYTHON_MODULE(limaandor3 ${CMAKE_CURRENT_BINARY_DIR}/sip/limaandor3.sip)
TARGET_INCLUDE_DIRECTORIES(python_module_limaandor3 PRIVATE
${PYTHON_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/sip"
"${CMAKE_SOURCE_DIR}/sip/core")
TARGET_LINK_LIBRARIES(python_module_limaandor3 limaandor3)
include(CameraRunSIP)
INSTALL(FILES python/__init__.py DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Andor3")
ENDIF()
src-dirs = src
test-dirs =
include ../../global.inc
# andor3 plugin Makefile
# Copyright (C) 2013 IPANEMA USR3461, CNRS/MCC.
# Written by Serge Cohen <serge.cohen@synchrotron-soleil.fr>
#
# This file 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 file 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 file. If not, see <http://www.gnu.org/licenses/>.
andor3-objs = Andor3Camera.o Andor3Interface.o Andor3DetInfoCtrlObj.o Andor3SyncCtrlObj.o Andor3RoiCtrlObj.o Andor3BinCtrlObj.o Andor3ReconstructionCtrlObj.o
SRCS = $(andor3-objs:.o=.cpp)
CXXFLAGS += -I../include -I../../../hardware/include -I../../../common/include \
-I/usr/local/include -I../../../third-party/Processlib/core/include -I../../../third-party/Processlib/tasks/include \
-Wall -pthread -fPIC -g -O2
all: Andor3.o
Andor3.o: $(andor3-objs)
$(LD) -o $@ -r $+
clean:
rm -f *.o *.P
%.o : %.cpp
$(COMPILE.cpp) -MD $(CXXFLAGS) -o $@ $<
@cp $*.d $*.P; \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
rm -f $*.d
-include $(SRCS:.cpp=.P)
.PHONY: check-syntax
check-syntax:
$(CXX) -Wall -Wextra -fsyntax-only $(CXXFLAGS) $(CHK_SOURCES)
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