Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
alarm-handler
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs
ds
alarm-handler
Commits
0cf08381
Commit
0cf08381
authored
6 months ago
by
Thomas Juerges
Committed by
Graziano Scalamera
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Add macOS compatibility"
parent
38b7db6e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3
Resolve "Add macOS compatibility"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+10
-2
10 additions, 2 deletions
CMakeLists.txt
test/testdevice/CMakeLists.txt
+10
-2
10 additions, 2 deletions
test/testdevice/CMakeLists.txt
with
20 additions
and
4 deletions
CMakeLists.txt
+
10
−
2
View file @
0cf08381
...
...
@@ -103,11 +103,19 @@ target_include_directories(alarm_handler
"
${
PROJECT_BINARY_DIR
}
"
${
Boost_INCLUDE_DIRS
}
)
set_target_properties
(
alarm_handler
PROPERTIES
if
(
NOT
(
CMAKE_CXX_COMPILER_ID STREQUAL
"AppleClang"
OR CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
))
set_target_properties
(
alarm_handler
PROPERTIES
OUTPUT_NAME
${
AH_NAME
}
LINK_FLAGS
"-Wl,--no-undefined"
CXX_STANDARD 17
)
else
()
set_target_properties
(
alarm_handler
PROPERTIES
OUTPUT_NAME
${
AH_NAME
}
LINK_FLAGS
""
CXX_STANDARD 17
)
endif
()
if
(
DO_CLANG_TIDY
)
set_target_properties
(
alarm_handler
...
...
This diff is collapsed.
Click to expand it.
test/testdevice/CMakeLists.txt
+
10
−
2
View file @
0cf08381
...
...
@@ -76,11 +76,19 @@ target_include_directories(testdevice
"
${
PROJECT_BINARY_DIR
}
"
)
set_target_properties
(
testdevice
PROPERTIES
if
(
NOT
(
CMAKE_CXX_COMPILER_ID STREQUAL
"AppleClang"
OR CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
))
set_target_properties
(
testdevice
PROPERTIES
OUTPUT_NAME
${
DEV_NAME
}
LINK_FLAGS
"-Wl,--no-undefined"
CXX_STANDARD 17
)
else
()
set_target_properties
(
testdevice
PROPERTIES
OUTPUT_NAME
${
DEV_NAME
}
LINK_FLAGS
""
CXX_STANDARD 17
)
endif
()
target_compile_options
(
testdevice
PRIVATE
"$<$<CONFIG:DEBUG>:-g>"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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