diff options
| -rw-r--r-- | csv/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | opentrack-compat/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | opentrack/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | pose-widget/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | spline-widget/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | spline-widget/functionconfig.cpp | 2 |
7 files changed, 17 insertions, 29 deletions
diff --git a/csv/CMakeLists.txt b/csv/CMakeLists.txt index 07dae55c..7e80317c 100644 --- a/csv/CMakeLists.txt +++ b/csv/CMakeLists.txt @@ -1,4 +1 @@ -opentrack_boilerplate(opentrack-csv NO-LIBRARY) -add_library(opentrack-csv STATIC ${opentrack-csv-c}) -opentrack_compat(opentrack-csv) -target_link_libraries(opentrack-csv ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-csv NO-LINKER-SCRIPT) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index f483f695..158804c2 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -17,12 +17,16 @@ opentrack_compat(opentrack) if(NOT WIN32) set_target_properties(opentrack PROPERTIES SUFFIX ".bin") endif() -target_link_libraries(opentrack opentrack-api opentrack-version opentrack-pose-widget opentrack-spline-widget) -if(UNIX OR APPLE) - target_link_libraries(opentrack opentrack-qxt-mini) -endif() + +target_link_libraries(opentrack + opentrack-spline-widget + opentrack-pose-widget + opentrack-api + opentrack-compat + opentrack-version +) + link_with_dinput8(opentrack) -target_link_libraries(opentrack ${MY_QT_LIBS}) if(APPLE) # for process detector @@ -30,6 +34,7 @@ if(APPLE) endif() if(LINUX) + target_link_libraries(opentrack dl) # for process detector target_link_libraries(opentrack procps) endif() diff --git a/opentrack-compat/CMakeLists.txt b/opentrack-compat/CMakeLists.txt index 4f5fd724..a92f4f31 100644 --- a/opentrack-compat/CMakeLists.txt +++ b/opentrack-compat/CMakeLists.txt @@ -1,4 +1,4 @@ -opentrack_boilerplate(opentrack-compat STATIC NO-COMPAT) +opentrack_boilerplate(opentrack-compat NO-COMPAT NO-LINKER-SCRIPT) if(NOT WIN32 AND NOT APPLE) target_link_libraries(opentrack-compat rt) endif() diff --git a/opentrack/CMakeLists.txt b/opentrack/CMakeLists.txt index 4581f394..590eaca5 100644 --- a/opentrack/CMakeLists.txt +++ b/opentrack/CMakeLists.txt @@ -1,10 +1,6 @@ -opentrack_boilerplate(opentrack-api NO-LIBRARY) -opentrack_qt(opentrack-api) -add_library(opentrack-api STATIC ${opentrack-api-all}) -opentrack_compat(opentrack-api) -target_link_libraries(opentrack-api ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-api NO-LINKER-SCRIPT NO-COMPAT) if(NOT WIN32) - target_link_libraries(opentrack-api dl) + target_link_libraries(opentrack-api opentrack-qxt-mini opentrack-compat dl) else() target_link_libraries(opentrack-api winmm) endif() diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt index 66891c21..66cafef7 100644 --- a/pose-widget/CMakeLists.txt +++ b/pose-widget/CMakeLists.txt @@ -1,6 +1 @@ -opentrack_boilerplate(opentrack-pose-widget NO-LIBRARY) -opentrack_qt(opentrack-pose-widget) -add_library(opentrack-pose-widget STATIC ${opentrack-pose-widget-all}) -opentrack_compat(opentrack-pose-widget) -target_include_directories(opentrack-pose-widget PUBLIC pose-widget/) # else Qt moc breaks -target_link_libraries(opentrack-pose-widget ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-pose-widget NO-LINKER-SCRIPT) diff --git a/spline-widget/CMakeLists.txt b/spline-widget/CMakeLists.txt index 522491ea..03706d91 100644 --- a/spline-widget/CMakeLists.txt +++ b/spline-widget/CMakeLists.txt @@ -1,6 +1 @@ -opentrack_boilerplate(opentrack-spline-widget NO-LIBRARY) -opentrack_qt(opentrack-spline-widget) -add_library(opentrack-spline-widget STATIC ${opentrack-spline-widget-all}) -opentrack_compat(opentrack-spline-widget) -target_include_directories(opentrack-spline-widget PUBLIC qfunctionconfigurator/) -target_link_libraries(opentrack-spline-widget ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-spline-widget NO-LINKER-SCRIPT) diff --git a/spline-widget/functionconfig.cpp b/spline-widget/functionconfig.cpp index 27f3bf40..dcc9ca65 100644 --- a/spline-widget/functionconfig.cpp +++ b/spline-widget/functionconfig.cpp @@ -6,11 +6,11 @@ * notice appear in all copies. */ +#include "functionconfig.h" #include <QMutexLocker> #include <QCoreApplication> #include <QPointF> #include <QList> -#include "functionconfig.h" #include <QtAlgorithms> #include <QtAlgorithms> #include <QSettings> |