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_1_0_0
  • release_1_1_0
  • release_1_1_1
  • release_1_1_10
  • release_1_1_11
  • release_1_1_12
  • release_1_1_13
  • release_1_1_14
  • release_1_1_15
  • release_1_1_16
  • release_1_1_17
  • release_1_1_18
  • release_1_1_19
  • release_1_1_2
  • release_1_1_3
  • release_1_1_4
  • release_1_1_5
  • release_1_1_6
  • release_1_1_7
  • release_1_1_8
  • release_1_1_9
  • release_1_2_0
  • release_1_2_1
  • v0
25 results

Target

Select target project
No results found
Select Git revision
  • main
  • release_1_0_0
  • release_1_1_0
  • release_1_1_1
  • release_1_1_10
  • release_1_1_11
  • release_1_1_12
  • release_1_1_13
  • release_1_1_14
  • release_1_1_15
  • release_1_1_16
  • release_1_1_17
  • release_1_1_18
  • release_1_1_19
  • release_1_1_2
  • release_1_1_3
  • release_1_1_4
  • release_1_1_5
  • release_1_1_6
  • release_1_1_7
  • release_1_1_8
  • release_1_1_9
  • release_1_2_0
  • release_1_2_1
  • v0
25 results
Show changes

Commits on Source 4

6 files
+ 104
0
Compare changes
  • Side-by-side
  • Inline

Files

.gitattributes

0 → 100644
+1 −0
Original line number Original line Diff line number Diff line
* text=auto eol=lf
 No newline at end of file

.gitignore

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line
.project
bin
target
# Ignore all files in folder test_package
test_package/*
# except conanfile.py
!test_package/conanfile.py

CMakeLists.txt

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line
cmake_minimum_required(VERSION 3.15)
project(${PROJECT_NAME} CXX)

find_package(yat4tango CONFIG REQUIRED)

if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
    find_package(crashreporting2 CONFIG)
endif()

add_compile_definitions(PROJECT_NAME=${PROJECT_NAME})
add_compile_definitions(PROJECT_VERSION=${PROJECT_VERSION})

file(GLOB_RECURSE sources
    src/*.cpp
)

list(FILTER sources EXCLUDE REGEX ".*Win32.*")

set(includedirs
    src
    include
)

add_executable(${EXECUTABLE_NAME} ${sources})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs})
target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat4tango::yat4tango)

if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
    target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2)
endif()

install(TARGETS ${EXECUTABLE_NAME} DESTINATION "." RUNTIME DESTINATION bin)

Jenkinsfile

0 → 100644
+1 −0
Original line number Original line Diff line number Diff line
conan.create(['el6-gcc44-x86-shared'])

conanfile.py

0 → 100644
+46 −0
Original line number Original line Diff line number Diff line
from conan import ConanFile
from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps


class AcquireWaveformLecroyRecipe(ConanFile):
    name = "acquirewaveformlecroy"
    executable = "ds_AcquireWaveformLecroy"
    version = "1.2.1"
    package_type = "application"
    user = "soleil"

    license = "GPL-3.0-or-later"
    author = "Xavier Elattaoui"
    url = "https://gitlab.synchrotron-soleil.fr/software-control-system/tango-devices/measureinstruments/lecroy/acquirewaveformlecroy.git"
    description = "AcquireWaveformLecroy device"
    topics = ("control-system", "tango", "device")

    settings = "os", "compiler", "build_type", "arch"

    exports_sources = "CMakeLists.txt", "src/*", "include/*"
    
    def requirements(self):
        self.requires("yat4tango/[>=1.0]@soleil/stable")
        if self.settings.os == "Linux":
            self.requires("crashreporting2/[>=1.0]@soleil/stable")
    
    def layout(self):
        cmake_layout(self)

    def generate(self):
        deps = CMakeDeps(self)
        deps.generate()
        tc = CMakeToolchain(self)
        tc.variables["PROJECT_NAME"] = self.name
        tc.variables["PROJECT_VERSION"] = self.version
        tc.variables["EXECUTABLE_NAME"] = self.executable
        tc.generate()

    def build(self):
        cmake = CMake(self)
        cmake.configure()
        cmake.build()

    def package(self):
        cmake = CMake(self)
        cmake.install()
+17 −0
Original line number Original line Diff line number Diff line
import os
from conan import ConanFile
from conan.tools.build import can_run


class AcquireWaveformLecroyTestConan(ConanFile):
    settings = "os", "compiler", "build_type", "arch"

    def requirements(self):
        self.requires(self.tested_reference_str)

    def test(self):
        if can_run(self):
            if self.settings.os == "Windows":
                self.run("ds_AcquireWaveformLecroy 2>&1 | findstr \"usage\"", env="conanrun")
            else:
                self.run("ds_AcquireWaveformLecroy 2>&1 | grep \"usage\"", env="conanrun")