Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
  • release_2_0_0
  • release_2_0_1
  • release_2_0_3
  • release_2_0_4
  • release_2_0_5
  • release_2_0_6
  • release_2_0_7
  • release_2_1_0
  • release_2_1_1
  • release_2_1_2
11 results

Target

Select target project
  • software-control-system/tango-devices/inputoutput/lib/dsl4agilent
1 result
Select Git revision
  • main
  • release_2_0_0
  • release_2_0_1
  • release_2_0_3
  • release_2_0_4
  • release_2_0_5
  • release_2_0_6
  • release_2_0_7
  • release_2_1_0
  • release_2_1_1
  • release_2_1_2
11 results
Show changes

Commits on Source 2

* text=auto eol=lf
target
build
CMakeUserPresets.json
cmake_minimum_required(VERSION 3.15)
project(dsl4agilent)
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
find_package(yat4tango CONFIG REQUIRED)
find_package(acqirisdevicedriver CONFIG REQUIRED)
add_compile_definitions(
PROJECT_NAME=${PROJECT_NAME}
PROJECT_VERSION=${PROJECT_VERSION}
_AGILENT_SUPPORT_
)
file(GLOB_RECURSE sources
src/*.cpp
)
set(includedirs
src
include
)
add_library(dsl4agilent ${sources})
target_include_directories(dsl4agilent PRIVATE ${includedirs})
target_link_libraries(dsl4agilent PRIVATE yat4tango::yat4tango)
target_link_libraries(dsl4agilent PRIVATE acqirisdevicedriver::acqirisdevicedriver)
if (MAJOR_VERSION)
set_target_properties(dsl4agilent PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION})
endif()
install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include
FILES_MATCHING PATTERN "*"
)
install(TARGETS dsl4agilent LIBRARY DESTINATION ${LIB_INSTALL_DIR})
conan.create(['win7-msvc12-x86'])
from conan import ConanFile
from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps
class dsl4agilentRecipe(ConanFile):
name = "dsl4agilent"
version = "1.2.13"
package_type = "library"
user = "soleil"
# Optional metadata
license = "GPL-2"
author = "Nicolas Leclercq"
url = "https://gitlab.synchrotron-soleil.fr/software-control-system/libraries/digitizersupportlib"
description = "Agilent/Acqiris Digitizers Support Library"
topics = ("utility", "control-system")
# Binary configuration
settings = "os", "compiler", "build_type", "arch"
options = {"shared": [True, False], "fPIC": [True, False]}
default_options = {"shared": False, "fPIC": True}
# Sources are located in the same place as this recipe, copy them to the recipe
exports_sources = "CMakeLists.txt", "src/**", "include/**"
def requirements(self):
self.requires("yat4tango/[>=1.0]@soleil/stable")
self.requires("acqirisdevicedriver/4.0.0@soleil/stable")
def config_options(self):
if self.settings.os == "Windows":
self.options.rm_safe("fPIC")
def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")
def layout(self):
cmake_layout(self)
def generate(self):
deps = CMakeDeps(self)
deps.generate()
tc = CMakeToolchain(self)
major, minor, patch = map(int, self.version.split('.'))
tc.variables["PROJECT_NAME"] = self.name
tc.variables["PROJECT_VERSION"] = self.version
tc.variables["MAJOR_VERSION"] = major
tc.variables["MINOR_VERSION"] = minor
tc.variables["PATCH_VERSION"] = patch
tc.generate()
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def package(self):
cmake = CMake(self)
cmake.install()
def package_info(self):
self.cpp_info.libs = ["dsl4agilent"]
cmake_minimum_required(VERSION 3.15)
project(PackageTest CXX)
find_package(yat CONFIG REQUIRED)
find_package(dsl4agilent CONFIG REQUIRED)
add_executable(test_package src/test_package.cpp)
target_link_libraries(test_package yat::yat)
target_link_libraries(test_package dsl4agilent::dsl4agilent)
import os
from conan import ConanFile
from conan.tools.cmake import CMake, cmake_layout
from conan.tools.build import can_run
class TestPackageConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "CMakeDeps", "CMakeToolchain"
def requirements(self):
self.requires(self.tested_reference_str)
self.requires("yat/[>=1.0]@soleil/stable")
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def layout(self):
cmake_layout(self)
def test(self):
cmd = os.path.join(self.cpp.build.bindir, "test_package")
self.run(cmd, env="conanrun")
#include <iostream>
#include <dsl/Waveform.h>
int main()
{
dsl::Waveform w;
std::cout << w.gain << '\n';
return 0;
}