Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
MythenWAXS
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Acquisition
1D
MythenWAXS
Commits
b8ab09f3
Commit
b8ab09f3
authored
1 year ago
by
POTIER Frederic
Committed by
MADELA Patrick
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix recipe
parent
a817722c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-2
0 additions, 2 deletions
CMakeLists.txt
conanfile.py
+0
-2
0 additions, 2 deletions
conanfile.py
with
0 additions
and
4 deletions
CMakeLists.txt
+
0
−
2
View file @
b8ab09f3
...
...
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.15)
project
(
${
PROJECT_NAME
}
CXX
)
find_package
(
yat4tango CONFIG REQUIRED
)
find_package
(
crashreporting CONFIG REQUIRED
)
if
(
NOT CMAKE_SYSTEM_NAME STREQUAL
"Windows"
)
find_package
(
crashreporting2 CONFIG
)
endif
()
...
...
@@ -21,7 +20,6 @@ set(includedirs
add_executable
(
${
EXECUTABLE_NAME
}
${
sources
}
)
target_include_directories
(
${
EXECUTABLE_NAME
}
PRIVATE
${
includedirs
}
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE yat4tango::yat4tango
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE crashreporting::crashreporting
)
if
(
NOT CMAKE_SYSTEM_NAME STREQUAL
"Windows"
)
target_link_libraries
(
${
EXECUTABLE_NAME
}
PRIVATE crashreporting2::crashreporting2
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
conanfile.py
+
0
−
2
View file @
b8ab09f3
...
...
@@ -21,8 +21,6 @@ class MythenWAXSRecipe(ConanFile):
def
requirements
(
self
):
self
.
requires
(
"
yat4tango/[>=1.0]@soleil/stable
"
)
self
.
requires
(
"
crashreporting/[>=1.0]@soleil/stable
"
)
if
self
.
settings
.
os
==
"
Linux
"
:
self
.
requires
(
"
crashreporting2/[>=1.0]@soleil/stable
"
)
...
...
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