CMake - update linux section / cosmetics

CMakeLists.txt

@@ -150,11 +150,9 @@ target_include_directories(pco
 
 target_link_libraries(pco PUBLIC limacore)
 
-#target_compile_definitions(pco PUBLIC ${PCO_DEFINITIONS})
-
-#target_include_directories(pco PUBLIC $<BUILD_INTERFACE:${PCO_INCLUDE_DIRS}>)
-
-#target_link_libraries(pco PUBLIC ${PCO_LIBRARIES})
+target_compile_definitions(pco PUBLIC ${PCO_DEFINITIONS})
+target_include_directories(pco PUBLIC $<BUILD_INTERFACE:${PCO_INCLUDE_DIRS}>)
+target_link_libraries(pco PUBLIC ${PCO_LIBRARIES})
 
 if(WIN32)
   target_compile_definitions(pco
@@ -205,11 +203,20 @@ install(
 
 if(LIMA_ENABLE_PYTHON)
   install(
-    FILES python/__init__.py
+    FILES 
+      python/__init__.py
     DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Pco"
   )
 endif()
 
+if(LIMA_ENABLE_PYTANGO_SERVER)
+  install(
+    FILES 
+      tango/Pco.py
+    DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Server/camera"
+  )
+endif()
+
 ## Tests
 if(CAMERA_ENABLE_TESTS)
     enable_testing()

cmake/FindPco.cmake

+###########################################################################
+# This file is part of LImA, a Library for Image Acquisition
+#
+#  Copyright (C) : 2009-2017
+#  European Synchrotron Radiation Facility
+#  CS40220 38043 Grenoble Cedex 9 
+#  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/>.
+############################################################################
+
 set(PCO_INCLUDE_DIRS)
 set(PCO_LIBRARIES)
 set(PCO_DEFINITIONS)
@@ -8,27 +32,63 @@ set(PCO_SDKLIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPcoLin" CACHE PATH "location
 if(WIN32)
   find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h" ${PCO_SDKWIN_DIR})
   find_library(PCO_LIBRARIES SC2_Cam ${PCO_SDKWIN_DIR}/lib64)
-  list(APPEND PCO_INCLUDE_DIRS ${PCO_INCLUDE_DIRS} ${PCO_INCLUDE_DIRS}/include)
+  list(APPEND PCO_INCLUDE_DIRS 
+    ${PCO_INCLUDE_DIRS} 
+    ${PCO_INCLUDE_DIRS}/include
+    )
 else()
-  #Current location of linux sdk, on the branch linux_dev.v123 the 09/06/17
   set(PCO_SDK_LIB_DIR "${PCO_SDKLIN_DIR}/pco_common/pco_lib" CACHE PATH "location of pco sdklib-lin")
 
-  #set(SISO_LIB_DIR "${SISODIR5}/lib64" CACHE PATH "sisolib")
-  set(SISO_LIB_DIR "/opt/SiliconSoftware/Runtime5.2.2/lib64" CACHE PATH "sisolib")
-
-  find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h")
-  find_library(PCO_CAM_ME4_LIB pcocam_me4 ${PCO_SDK_LIB_DIR})
-  find_library(PCO_FILE_LIB pcofile ${PCO_SDK_LIB_DIR})
-  find_library(PCO_LOG_LIB pcolog ${PCO_SDK_LIB_DIR})
-  find_library(PCO_FUNC_LIB reorderfunc ${PCO_SDK_LIB_DIR})
-  find_library(SISO_LIB_FGLIB5 fglib5 ${SISO_LIB_DIR})
-  find_library(SISO_LIB_CLSERSIS clsersis ${SISO_LIB_DIR})
-  find_library(SISO_LIB_HAPRT haprt ${SISO_LIB_DIR})
-  list(APPEND PCO_LIBRARIES ${PCO_CAM_ME4_LIB} ${PCO_FILE_LIB} ${PCO_LOG_LIB} ${PCO_FUNC_LIB} ${SISO_LIB_FGLIB5} ${SISO_LIB_CLSERSIS} ${SISO_LIB_HAPRT})
+  set(SISO_DIR "$ENV{SISODIR5}" CACHE PATH "SISO BASE DIR")
+  set(SISO_LIB_DIR "${SISO_DIR}/lib" CACHE PATH "SISO LIB DIR")
+
+list(APPEND PCO_INCLUDE_DIRS
+  ${SISO_DIR}/include
+  ${PCO_SDKLIN_DIR}/include
+  ${PCO_SDKLIN_DIR}
+  ${PCO_SDKLIN_DIR}/pco_common/pco_include
+  ${PCO_SDKLIN_DIR}/pco_common/pco_classes
+  ${PCO_SDKLIN_DIR}/pco_me4/pco_classes
+  ${PCO_SDKWIN_DIR}/include
+  )
+
+
+ set(LP1)
+ set(LP2)
+ set(LP3)
+ set(LP4)
+ 
+ find_library(LP1 pcocam_me4 HINTS ${PCO_SDK_LIB_DIR})
+ find_library(LP2 pcofile HINTS ${PCO_SDK_LIB_DIR})
+ find_library(LP3 pcolog HINTS ${PCO_SDK_LIB_DIR})
+ find_library(LP4 reorderfunc HINTS ${PCO_SDK_LIB_DIR})
+
+ set(LS1)
+ set(LS2)
+ set(LS3)
+ find_library(LS1 fglib5 HINTS ${SISO_LIB_DIR})
+ find_library(LS2 clsersis HINTS ${SISO_LIB_DIR})
+ find_library(LS3 haprt HINTS ${SISO_LIB_DIR})
+ 
+ 
+ list(APPEND PCO_LIBRARIES 
+    ${LP1} ${LP2} ${LP3} ${LP4}
+    ${LS1} ${LS2} ${LS3}
+    )
+
 endif()
 
+
+message("PCO_LIBRARIES ============================================")
+message("${PCO_LIBRARIES}")
+message("==========================================================")
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(PCO DEFAULT_MSG
   PCO_LIBRARIES
   PCO_INCLUDE_DIRS
 )
+
+list(APPEND PCO_DEFINITIONS WITH_GIT_VERSION)
+
+

cmake/project-config.cmake.in

-# Config file for @PROJECT_NAME_LOWER@
-#
-# It defines the following variables:
-#
-# @PROJECT_NAME_UPPER@_INCLUDE_DIRS     - include directory
-# @PROJECT_NAME_UPPER@_LIBRARIES        - all dynamic libraries
-# @PROJECT_NAME_UPPER@_STATIC_LIBRARIES - all static libraries
-
-@PACKAGE_INIT@
-
-# Add dependencies here
-include(CMakeFindDependencyMacro)
-find_dependency(Lima)
-
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
-
-check_required_components(@PROJECT_NAME_LOWER@)