Commit 13a51c83 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch '1-windows-missing' into 'master'

Resolve "windows missing"

Closes #1

See merge request !6
parents e4cc04ff 6fd74e8b
Pipeline #10566 passed with stages
in 12 minutes and 24 seconds
......@@ -2,3 +2,4 @@
*bck
*.swp
*target*
build/
......@@ -18,6 +18,13 @@ build-linux:
tags:
- linux
build-win:
<<: *build-conda
script:
- conda build ./conda/camera --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
tags:
- win
build-noarch:
<<: *build-conda
stage: build-noarch
......@@ -25,7 +32,8 @@ build-noarch:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
- build-win
deploy-devel:
stage: deploy
environment:
......@@ -33,6 +41,7 @@ deploy-devel:
url: http://bcu-ci.esrf.fr/devel
dependencies:
- build-linux
- build-win
- build-noarch
script:
- cp -Rf dist/* /conda-devel/
......@@ -53,6 +62,7 @@ deploy-stable:
url: http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
- build-win
- build-noarch
script:
- cp -Rf dist/* /conda/
......

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLimaAndor", "LibAndor\LibAndor.vcproj", "{F21E8C5B-7543-4A4C-9459-5C43FE5C84F2}"
ProjectSection(ProjectDependencies) = postProject
{F6556656-D091-43AF-B46F-355F4ABA5DB6} = {F6556656-D091-43AF-B46F-355F4ABA5DB6}
{A4B703A6-C50F-442F-8952-54FB8EA51FF3} = {A4B703A6-C50F-442F-8952-54FB8EA51FF3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLimaCore", "..\..\..\..\..\build\msvc\9.0\LimaCore\LimaCore.vcproj", "{A4B703A6-C50F-442F-8952-54FB8EA51FF3}"
ProjectSection(ProjectDependencies) = postProject
{F6556656-D091-43AF-B46F-355F4ABA5DB6} = {F6556656-D091-43AF-B46F-355F4ABA5DB6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprocesslib", "..\..\..\..\..\third-party\Processlib\build\msvc\9.0\libprocesslib\libprocesslib.vcproj", "{F6556656-D091-43AF-B46F-355F4ABA5DB6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F21E8C5B-7543-4A4C-9459-5C43FE5C84F2}.Debug|Win32.ActiveCfg = Debug|Win32
{F21E8C5B-7543-4A4C-9459-5C43FE5C84F2}.Debug|Win32.Build.0 = Debug|Win32
{F21E8C5B-7543-4A4C-9459-5C43FE5C84F2}.Release|Win32.ActiveCfg = Release|Win32
{F21E8C5B-7543-4A4C-9459-5C43FE5C84F2}.Release|Win32.Build.0 = Release|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.ActiveCfg = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.Build.0 = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.ActiveCfg = Release|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.Build.0 = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.ActiveCfg = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.Build.0 = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.ActiveCfg = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="LibLimaAndor"
ProjectGUID="{C39313C8-55F9-42CA-8A46-A03C16A7AA3A}"
RootNamespace="LibAndor"
Keyword="ManagedCProj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="&quot;C:\Program Files\Andor iKon\Drivers\&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\third-party\Processlib\core\include\&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\third-party\Processlib\core\include\WindowSpecific&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\common\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\hardware\include&quot;;&quot;$(ProjectDir)\..\..\..\..\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;LIBANDOR_EXPORTS;_WIN32_WINNT=0x0502"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
AdditionalDependencies="&quot;C:\Program Files\Andor iKon\Drivers\ATMCD32M.lib&quot; $(InputDir)..\..\..\..\..\..\build\msvc\9.0\LimaCore\Debug\liblimacore.lib $(InputDir)..\..\..\..\..\..\third-party\Processlib\build\msvc\9.0\libprocesslib\Debug\libprocesslib.lib"
OutputFile="$(InputDir)$(IntDir)\$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
AssemblyDebug="0"
SubSystem="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="0"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="&quot;C:\Program Files\Andor iKon\Drivers&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\third-party\Processlib\core\include\&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\third-party\Processlib\core\include\WindowSpecific&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\common\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\..\hardware\include&quot;;&quot;$(ProjectDir)\..\..\..\..\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;LIBANDOR_EXPORTS;_WIN32_WINNT=0x0502"
MinimalRebuild="true"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ATMCD32M.LIB $(InputDir)..\..\..\..\..\..\build\msvc\9.0\LimaCore\Release\liblimacore.lib $(InputDir)..\..\..\..\..\..\third-party\Processlib\build\msvc\9.0\libprocesslib\Release\libprocesslib.lib"
OutputFile="$(InputDir)$(IntDir)\$(ProjectName).dll"
LinkIncremental="0"
AdditionalLibraryDirectories="&quot;C:\Program Files\Andor iKon\Drivers&quot;"
GenerateDebugInformation="true"
LinkTimeCodeGeneration="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
<AssemblyReference
RelativePath="System.dll"
AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
MinFrameworkVersion="131072"
/>
<AssemblyReference
RelativePath="System.Data.dll"
AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
MinFrameworkVersion="131072"
/>
<AssemblyReference
RelativePath="System.XML.dll"
AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
MinFrameworkVersion="131072"
/>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\..\src\AndorBinCtrlObj.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorCamera.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorDetInfoCtrlObj.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorInterface.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorRoiCtrlObj.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorShutterCtrlObj.cpp"
>
</File>
<File
RelativePath="..\..\..\..\src\AndorSyncCtrlObj.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\..\..\include\AndorBinCtrlObj.h"
>
</File>
<File
RelativePath="..\..\..\..\include\AndorCamera.h"
>
</File>
<File
RelativePath="..\..\..\..\..\include\AndorCompatibility.h"
>
</File>
<File
RelativePath="..\..\..\..\..\include\AndorDetInfoCtrlObj.h"
>
</File>
<File
RelativePath="..\..\..\..\..\include\AndorInterface.h"
>
</File>
<File
RelativePath="..\..\..\..\include\AndorRoiCtrlObj.h"
>
</File>
<File
RelativePath="..\..\..\..\include\AndorShutterCtrlObj.h"
>
</File>
<File
RelativePath="..\..\..\..\..\include\AndorSyncCtrlObj.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
......@@ -5,6 +5,7 @@ set(ANDOR_DEFINITIONS)
if(WIN32)
# Missing find_path here
find_library(ANDOR_LIBRARIES atmcd64m)
find_path(ANDOR_INCLUDE_DIRS "atmcd32d.h")
else()
find_path(ANDOR_INCLUDE_DIRS "atmcdLXd.h")
find_library(ANDOR_LIBRARIES andor)
......
......@@ -22,7 +22,8 @@
#ifndef ANDORBINCTRLOBJ_H
#define ANDORBINCTRLOBJ_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwBinCtrlObj.h"
#include "AndorCamera.h"
......@@ -35,7 +36,7 @@ namespace lima
* \class BinCtrlObj
* \brief Control object providing Andor Bin interface
*******************************************************************/
class LIBANDOR_API BinCtrlObj : public HwBinCtrlObj
class ANDOR_EXPORT BinCtrlObj : public HwBinCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera, "BinCtrlObj", "Andor");
public:
......
......@@ -22,13 +22,12 @@
#ifndef ANDORCAMERA_H
#define ANDORCAMERA_H
#include "AndorCompatibility.h"
#if defined (__GNUC__) && (__GNUC__ == 3) && defined (__ELF__)
# define GENAPI_DECL __attribute__((visibility("default")))
# define GENAPI_DECL_ABSTRACT __attribute__((visibility("default")))
#endif
#include <andor_export.h>
#if defined(WIN32)
......@@ -141,7 +140,7 @@ namespace lima
* \class Camera
* \brief object controlling the andor camera via Pylon driver
*******************************************************************/
class LIBANDOR_API Camera
class ANDOR_EXPORT Camera
{
DEB_CLASS_NAMESPC(DebModCamera, "Camera", "Andor");
friend class Interface;
......
//###########################################################################
// This file is part of LImA, a Library for Image Acquisition
//
// Copyright (C) : 2009-2011
// 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/>.
//###########################################################################
#ifndef ANDORCOMPATIBILITY_H
#define ANDORCOMPATIBILITY_H
#ifdef WIN32
#ifdef LIBANDOR_EXPORTS
#define LIBANDOR_API __declspec(dllexport)
#else
#define LIBANDOR_API __declspec(dllimport)
#endif
#else /* Unix */
#define LIBANDOR_API
#endif
#endif
......@@ -22,7 +22,8 @@
#ifndef ANDORDETINFOCTRLOBJ_H
#define ANDORDETINFOCTRLOBJ_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwDetInfoCtrlObj.h"
#include "AndorCamera.h"
......@@ -36,7 +37,7 @@ namespace lima
* \brief Control object providing Andor detector info interface
*******************************************************************/
class LIBANDOR_API DetInfoCtrlObj : public HwDetInfoCtrlObj
class ANDOR_EXPORT DetInfoCtrlObj : public HwDetInfoCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera, "DetInfoCtrlObj", "Andor");
......
......@@ -22,7 +22,8 @@
#ifndef ANDORINTERFACE_H
#define ANDORINTERFACE_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwInterface.h"
#include "AndorCamera.h"
#include "AndorDetInfoCtrlObj.h"
......@@ -43,7 +44,7 @@ namespace lima
* \brief Andor hardware interface
*******************************************************************/
class LIBANDOR_API Interface : public HwInterface
class ANDOR_EXPORT Interface : public HwInterface
{
DEB_CLASS_NAMESPC(DebModCamera, "AndorInterface", "Andor");
......
......@@ -22,7 +22,8 @@
#ifndef ANDORROICTRLOBJ_H
#define ANDORROICTRLOBJ_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwRoiCtrlObj.h"
#include "AndorCamera.h"
......@@ -37,7 +38,7 @@ namespace lima
* \brief Control object providing Andor Roi interface
*******************************************************************/
class LIBANDOR_API RoiCtrlObj : public HwRoiCtrlObj
class ANDOR_EXPORT RoiCtrlObj : public HwRoiCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera, "RoiCtrlObj", "Andor");
......
......@@ -22,7 +22,8 @@
#ifndef ANDORSHUTTERCTRLOBJ_H
#define ANDORSHUTTERCTRLOBJ_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwShutterCtrlObj.h"
#include "AndorCamera.h"
......@@ -36,7 +37,7 @@ namespace lima
* \brief Control object providing Andor shutter interface
*******************************************************************/
class LIBANDOR_API ShutterCtrlObj : public HwShutterCtrlObj
class ANDOR_EXPORT ShutterCtrlObj : public HwShutterCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera, "ShutterCtrlObj", "Andor");
......
......@@ -22,7 +22,8 @@
#ifndef ANDORSYNCCTRLOBJ_H
#define ANDORSYNCCTRLOBJ_H
#include "AndorCompatibility.h"
#include <andor_export.h>
#include "lima/HwInterface.h"
#include "AndorCamera.h"
......@@ -37,7 +38,7 @@ namespace lima
* \brief Control object providing Andor synchronization interface
*******************************************************************/
class LIBANDOR_API SyncCtrlObj : public HwSyncCtrlObj
class ANDOR_EXPORT SyncCtrlObj : public HwSyncCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera, "SyncCtrlObj", "Andor");
......
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