...
 
Commits (3)
......@@ -62,10 +62,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIR
include(project_version)
# Enable git hash in the version
option(WITH_GIT_VERSION "compile python binding code?" OFF)
option(WITH_GIT_VERSION "Enable git hash in the version?" OFF)
# Enable python binding code compilation using sip generator
option(CAMERA_ENABLE_PYTHON "compile python binding code?" LIMA_ENABLE_PYTHON)
if (CAMERA_MASTER_PROJECT)
option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF)
endif()
if (CAMERA_ENABLE_PYTHON)
# Find python interpreter and libs
......@@ -177,11 +180,12 @@ if(WIN32)
endif()
# Binding code for python
if(CAMERA_ENABLE_PYTHON)
if(LIMA_ENABLE_PYTHON)
include(LimaTools)
limatools_run_sip_for_camera(pco)
endif()
# Generate and install package config file and version
if(CAMERA_MASTER_PROJECT)
set(PROJECT_LIBRARIES pco)
......
......@@ -30,9 +30,17 @@ set(PCO_SDKWIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPco" CACHE PATH "location of
set(PCO_SDKLIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPcoLin" CACHE PATH "location of PCO Linux SDK")
if(WIN32)
#=========================== WIN
find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h" ${PCO_SDKWIN_DIR})
find_library(PCO_LIBRARIES NAMES SC2_Cam.lib HINTS ${PCO_SDKWIN_DIR}/lib64)
list(APPEND PCO_INCLUDE_DIRS
${PCO_INCLUDE_DIRS}/include
)
#find_library(PCO_LIBRARIES NAMES SC2_Cam.lib HINTS ${PCO_SDKWIN_DIR}/lib64)
find_library(PCO_LIBRARIES SC2_Cam ${PCO_SDKWIN_DIR}/lib64)
else()
#=========================== LINUX
set(PCO_SDK_LIB_DIR "${PCO_SDKLIN_DIR}/pco_common/pco_lib" CACHE PATH "location of pco sdklib-lin")
set(SISO_DIR "$ENV{SISODIR5}" CACHE PATH "SISO BASE DIR")
......@@ -73,11 +81,16 @@ list(APPEND PCO_INCLUDE_DIRS
)
endif()
#=========================== endif
list(APPEND PCO_DEFINITIONS
WITH_GIT_VERSION
)
message("PCO_LIBRARIES ============================================")
message("PCO_INCLUDE_DIRS: ${PCO_INCLUDE_DIRS}")
message("PCO_LIBRARIES: ${PCO_LIBRARIES}")
message("==========================================================")
message("PCO_INCLUDE_DIRS: [${PCO_INCLUDE_DIRS}]")
message("PCO_LIBRARIES: [${PCO_LIBRARIES}]")
message("PCO_DEFINITIONS: [${PCO_DEFINITIONS}]")
message("==========================================================")
include(FindPackageHandleStandardArgs)
......@@ -86,6 +99,5 @@ find_package_handle_standard_args(PCO DEFAULT_MSG
PCO_INCLUDE_DIRS
)
list(APPEND PCO_DEFINITIONS WITH_GIT_VERSION)
DIR_FROM="/c/Users/opid19/lim/out/install/x64-Release"
DIR_PCO_FROM="/c/Users/opid19/lim/camera/pco/tango"
DIR_TO="/c/Miniconda3/envs/pcodeb1"
cp -rp ${DIR_FROM}/python/Lib/site-packages/ ${DIR_TO}/Lib/
rm -fr ${DIR_TO}/Lib/site-packages/Lima/Server/camera/*
cp -p ${DIR_FROM}/python/Lib/site-packages/Lima/Server/camera/__init__.py ${DIR_TO}/Lib/site-packages/Lima/Server/camera/
cp -p ${DIR_FROM}/python/Lib/site-packages/Lima/Server/camera/Pco* ${DIR_TO}/Lib/site-packages/Lima/Server/camera/
#cp -p ${DIR_PCO_FROM}/Pco* ${DIR_TO}/Lib/site-packages/Lima/Server/camera/
cp -rp ${DIR_FROM}/lib/ ${DIR_TO}/Library/
cp -rp ${DIR_FROM}/bin/ ${DIR_TO}/Library/
find ${DIR_TO} -name "*lima*dll"
find ${DIR_TO} -name "*lima*lib"
find ${DIR_TO} -name "*lima*pyd"