Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Corryvreckan
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Fabian Simon Lex
Corryvreckan
Commits
02908cf0
Commit
02908cf0
authored
4 years ago
by
Simon Spannagel
Browse files
Options
Downloads
Patches
Plain Diff
Split logging and other utils into separate library
parent
40b92d88
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-0
2 additions, 0 deletions
CMakeLists.txt
src/core/CMakeLists.txt
+19
-3
19 additions, 3 deletions
src/core/CMakeLists.txt
src/objects/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/objects/CMakeLists.txt
with
22 additions
and
4 deletions
CMakeLists.txt
+
2
−
0
View file @
02908cf0
...
...
@@ -189,6 +189,8 @@ INCLUDE("cmake/clang-cpp-checks.cmake")
# Always include sources from top directory
INCLUDE_DIRECTORIES
(
src
)
SET
(
CORRYVRECKAN_LIBRARIES
${
CORRYVRECKAN_LIBRARIES
}
CorryvreckanUtilities
)
# Build objects library
ADD_SUBDIRECTORY
(
src/objects
)
SET
(
CORRYVRECKAN_LIBRARIES
${
CORRYVRECKAN_LIBRARIES
}
CorryvreckanObjects
)
...
...
This diff is collapsed.
Click to expand it.
src/core/CMakeLists.txt
+
19
−
3
View file @
02908cf0
# Include the dependencies
INCLUDE_DIRECTORIES
(
SYSTEM
${
CORRYVRECKAN_DEPS_INCLUDE_DIRS
}
)
# Create core library
ADD_LIBRARY
(
CorryvreckanUtilities SHARED
utils/log.cpp
utils/unit.cpp
utils/text.cpp
)
# Define compile-time library extension and add compiler flags
TARGET_COMPILE_DEFINITIONS
(
CorryvreckanUtilities PRIVATE SHARED_LIBRARY_SUFFIX=
"
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
"
)
TARGET_COMPILE_OPTIONS
(
CorryvreckanUtilities PRIVATE
${
CORRYVRECKAN_CXX_FLAGS
}
)
# Link the DL libraries
TARGET_LINK_LIBRARIES
(
CorryvreckanUtilities
${
CMAKE_DL_LIBS
}
)
# Create standard install target
INSTALL
(
TARGETS CorryvreckanUtilities
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
)
# Create core library
ADD_LIBRARY
(
CorryvreckanCore SHARED
Corryvreckan.cpp
detector/Detector.cpp
detector/PixelDetector.cpp
detector/exceptions.cpp
utils/log.cpp
utils/unit.cpp
utils/text.cpp
clipboard/Clipboard.cpp
config/ConfigManager.cpp
config/ConfigReader.cpp
...
...
This diff is collapsed.
Click to expand it.
src/objects/CMakeLists.txt
+
1
−
1
View file @
02908cf0
...
...
@@ -57,7 +57,7 @@ ADD_LIBRARY(CorryvreckanObjects SHARED
# Link the standard dependencies
TARGET_INCLUDE_DIRECTORIES
(
CorryvreckanObjects INTERFACE
${
GBL_INCLUDE_DIRS
}
)
TARGET_LINK_LIBRARIES
(
CorryvreckanObjects
${
CORRYVRECKAN_DEPS_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
CorryvreckanObjects
${
CORRYVRECKAN_LIBRARIES
}
${
CORRYVRECKAN_DEPS_LIBRARIES
}
)
TARGET_COMPILE_OPTIONS
(
CorryvreckanObjects PRIVATE
${
CORRYVRECKAN_CXX_FLAGS
}
)
# Specify install for the messages
...
...
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