summaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-11-27 03:03:24 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-11-27 03:03:24 +0100
commita8c711c6b828c8eefb947ba60ef8c5c8233c5756 (patch)
treefdc50e6cedaa893e3fa1d4f1f75ef8800f070787 /CMakeLists.txt
parent09aeee333b807be87f456fa226fc0442d5a37364 (diff)
Link against qt5serialport properly
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0aaf4f01..7ff5268e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -374,9 +374,10 @@ endif()
if(APPLE)
link_directories(${CMAKE_INSTALL_PREFIX})
- set(MY_QT_LIBS Qt5Widgets Qt5Gui Qt5Network Qt5Xml Qt5Core ${my-qt-deps})
+ set(MY_QT_LIBS Qt5Widgets Qt5Gui Qt5Network Qt5Xml Qt5Core Qt5SerialPort ${my-qt-deps})
else()
- SET(MY_QT_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${my-qt-deps})
+ SET(MY_QT_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES}
+ ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5SerialPort_LIBRARIES} ${my-qt-deps})
endif()
add_library(opentrack-csv SHARED ${opentrack-csv-c} ${opentrack-csv-h})
@@ -532,7 +533,7 @@ if(SDK_ARUCO_LIBPATH)
endif()
add_library(opentrack-tracker-hatire SHARED ${opentrack-tracker-hatire-c} ${opentrack-tracker-hatire-h} ${opentrack-tracker-hatire-moc} ${opentrack-tracker-hatire-uih} ${opentrack-tracker-hatire-rcc})
-target_link_libraries(opentrack-tracker-hatire ${MY_QT_LIBS} Qt5SerialPort)
+target_link_libraries(opentrack-tracker-hatire ${MY_QT_LIBS})
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(opentrack-tracker-hatire
PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/facetracknoir/posix-version-script.txt")