Skip to content
Snippets Groups Projects
Commit d62e035e authored by Schrödter, Tobias's avatar Schrödter, Tobias
Browse files

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!129Fix CMake issue on MacOS
Pipeline #46077 passed
...@@ -103,6 +103,12 @@ endif() ...@@ -103,6 +103,12 @@ endif()
################################################################################ ################################################################################
# Dependencies # 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 win32 and mingw use in 3rd party
if (USE_3RD_PARTY) if (USE_3RD_PARTY)
# Setting path to OpenCV # Setting path to OpenCV
...@@ -116,9 +122,9 @@ endif () ...@@ -116,9 +122,9 @@ endif ()
# Qt # Qt
find_package( find_package(
Qt5 5.14 Qt5 5.14
COMPONENTS Widgets OpenGL Xml Core PrintSupport Concurrent COMPONENTS Widgets OpenGL Xml Core PrintSupport Concurrent
REQUIRED REQUIRED
) )
message("Building with Qt${QT_DEFAULT_MAJOR_VERSION} (${Qt5Core_VERSION_STRING})") message("Building with Qt${QT_DEFAULT_MAJOR_VERSION} (${Qt5Core_VERSION_STRING})")
...@@ -211,11 +217,7 @@ target_sources(petrack_core PRIVATE src/analysePlot.cpp) ...@@ -211,11 +217,7 @@ target_sources(petrack_core PRIVATE src/analysePlot.cpp)
#***************************************************************** #*****************************************************************
# Linking ezc3d * # 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) target_link_libraries(petrack_core PUBLIC ezc3d)
set(BUILD_SHARED_LIBS ${DUMMY})
#************************************************************* #*************************************************************
# Handling of Options * # Handling of Options *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment