Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Electrometers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
MeasureInstruments
lib
Electrometers
Commits
be6aefe5
Commit
be6aefe5
authored
Oct 23, 2023
by
Patrick MADELA
Browse files
Options
Downloads
Patches
Plain Diff
Rename electrometerslibrary to electrometers
parent
0709f5b1
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+6
-6
6 additions, 6 deletions
CMakeLists.txt
conanfile.py
+3
-3
3 additions, 3 deletions
conanfile.py
test_package/CMakeLists.txt
+2
-2
2 additions, 2 deletions
test_package/CMakeLists.txt
with
11 additions
and
11 deletions
CMakeLists.txt
+
6
−
6
View file @
be6aefe5
cmake_minimum_required
(
VERSION 3.15
)
cmake_minimum_required
(
VERSION 3.15
)
project
(
electrometers
library
)
project
(
electrometers
)
option
(
BUILD_SHARED_LIBS
"Build using shared libraries"
ON
)
option
(
BUILD_SHARED_LIBS
"Build using shared libraries"
ON
)
...
@@ -20,16 +20,16 @@ set(includedirs
...
@@ -20,16 +20,16 @@ set(includedirs
include
include
)
)
add_library
(
electrometers
library
${
sources
}
)
add_library
(
electrometers
${
sources
}
)
target_include_directories
(
electrometers
library
PRIVATE
${
includedirs
}
)
target_include_directories
(
electrometers PRIVATE
${
includedirs
}
)
target_link_libraries
(
electrometers
library
PRIVATE cpptango::cpptango
)
target_link_libraries
(
electrometers PRIVATE cpptango::cpptango
)
if
(
MAJOR_VERSION
)
if
(
MAJOR_VERSION
)
set_target_properties
(
electrometers
library
PROPERTIES VERSION
${
PROJECT_VERSION
}
SOVERSION
${
MAJOR_VERSION
}
)
set_target_properties
(
electrometers PROPERTIES VERSION
${
PROJECT_VERSION
}
SOVERSION
${
MAJOR_VERSION
}
)
endif
()
endif
()
install
(
DIRECTORY
${
CMAKE_SOURCE_DIR
}
/include/ DESTINATION include
install
(
DIRECTORY
${
CMAKE_SOURCE_DIR
}
/include/ DESTINATION include
FILES_MATCHING PATTERN
"*.h"
FILES_MATCHING PATTERN
"*.h"
)
)
install
(
TARGETS electrometers
library
LIBRARY DESTINATION
${
LIB_INSTALL_DIR
}
)
install
(
TARGETS electrometers LIBRARY DESTINATION
${
LIB_INSTALL_DIR
}
)
This diff is collapsed.
Click to expand it.
conanfile.py
+
3
−
3
View file @
be6aefe5
from
conan
import
ConanFile
from
conan
import
ConanFile
from
conan.tools.cmake
import
CMakeToolchain
,
CMake
,
cmake_layout
,
CMakeDeps
from
conan.tools.cmake
import
CMakeToolchain
,
CMake
,
cmake_layout
,
CMakeDeps
class
electrometers
library
Recipe
(
ConanFile
):
class
electrometersRecipe
(
ConanFile
):
name
=
"
electrometers
library
"
name
=
"
electrometers
"
version
=
"
2.5.29
"
version
=
"
2.5.29
"
package_type
=
"
library
"
package_type
=
"
library
"
user
=
"
soleil
"
user
=
"
soleil
"
...
@@ -58,4 +58,4 @@ class electrometerslibraryRecipe(ConanFile):
...
@@ -58,4 +58,4 @@ class electrometerslibraryRecipe(ConanFile):
cmake
.
install
()
cmake
.
install
()
def
package_info
(
self
):
def
package_info
(
self
):
self
.
cpp_info
.
libs
=
[
"
electrometers
library
"
]
self
.
cpp_info
.
libs
=
[
"
electrometers
"
]
This diff is collapsed.
Click to expand it.
test_package/CMakeLists.txt
+
2
−
2
View file @
be6aefe5
cmake_minimum_required
(
VERSION 3.15
)
cmake_minimum_required
(
VERSION 3.15
)
project
(
PackageTest CXX
)
project
(
PackageTest CXX
)
find_package
(
electrometers
library
CONFIG REQUIRED
)
find_package
(
electrometers CONFIG REQUIRED
)
find_package
(
cpptango CONFIG REQUIRED
)
find_package
(
cpptango CONFIG REQUIRED
)
add_executable
(
test_package src/test_package.cpp
)
add_executable
(
test_package src/test_package.cpp
)
target_link_libraries
(
test_package electrometers
library
::electrometers
library
)
target_link_libraries
(
test_package electrometers::electrometers
)
target_link_libraries
(
test_package cpptango::cpptango
)
target_link_libraries
(
test_package cpptango::cpptango
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment