Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
d62e035e
Commit
d62e035e
authored
3 years ago
by
Schrödter, Tobias
Browse files
Options
Downloads
Plain Diff
Merge branch '206-compilation-fails-on-macos' into 'master'
Fix CMake issue on MacOS Closes
#206
See merge request
!129
parents
48d0e4fd
5e289b0f
No related branches found
No related tags found
1 merge request
!129
Fix CMake issue on MacOS
Pipeline
#46077
passed
3 years ago
Stage: build_environment
Stage: pre-build-checks
Stage: build
Stage: test
Changes
1
Pipelines
17
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+9
-7
9 additions, 7 deletions
CMakeLists.txt
with
9 additions
and
7 deletions
CMakeLists.txt
+
9
−
7
View file @
d62e035e
...
...
@@ -103,6 +103,12 @@ endif()
################################################################################
# Dependencies
################################################################################
# ezc3d
set
(
DUMMY
${
BUILD_SHARED_LIBS
}
)
set
(
BUILD_SHARED_LIBS FALSE CACHE BOOL
"Choose if build should be a dynamic or static library"
)
add_subdirectory
(
ezc3d/ EXCLUDE_FROM_ALL
)
set
(
BUILD_SHARED_LIBS
${
DUMMY
}
)
# if win32 and mingw use in 3rd party
if
(
USE_3RD_PARTY
)
# Setting path to OpenCV
...
...
@@ -116,9 +122,9 @@ endif ()
# Qt
find_package
(
Qt5 5.14
COMPONENTS Widgets OpenGL Xml Core PrintSupport Concurrent
REQUIRED
Qt5 5.14
COMPONENTS Widgets OpenGL Xml Core PrintSupport Concurrent
REQUIRED
)
message
(
"Building with Qt
${
QT_DEFAULT_MAJOR_VERSION
}
(
${
Qt5Core_VERSION_STRING
}
)"
)
...
...
@@ -211,11 +217,7 @@ target_sources(petrack_core PRIVATE src/analysePlot.cpp)
#*****************************************************************
# Linking ezc3d *
#*****************************************************************
set
(
DUMMY
${
BUILD_SHARED_LIBS
}
)
set
(
BUILD_SHARED_LIBS FALSE CACHE BOOL
"Choose if build should be a dynamic or static library"
)
add_subdirectory
(
ezc3d/ EXCLUDE_FROM_ALL
)
target_link_libraries
(
petrack_core PUBLIC ezc3d
)
set
(
BUILD_SHARED_LIBS
${
DUMMY
}
)
#*************************************************************
# Handling of Options *
...
...
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