From d58e8a9a48b2b230ba4e65653abc9654c1f9c01c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 1 Nov 2015 06:24:58 +0100 Subject: try not to statically link qxt-mini cf. 3e60ccda96dfada9307a0a25134475c726f1ae72 --- gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui') diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index b2540a68..19e98571 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -17,7 +17,7 @@ opentrack_compat(opentrack) if(UNIX OR APPLE) target_include_directories(opentrack PRIVATE "${CMAKE_SOURCE_DIR}/qxt-mini") - opentrack_library(opentrack-qxt-mini ${CMAKE_SOURCE_DIR}/qxt-mini NO-LINKER-SCRIPT STATIC) + opentrack_library(opentrack-qxt-mini ${CMAKE_SOURCE_DIR}/qxt-mini NO-LINKER-SCRIPT NO-COMPAT) if(NOT APPLE) target_link_libraries(opentrack-qxt-mini X11) endif() -- cgit v1.2.3 From f14becff3653fa71911303fb0898a5d5a9cdfe95 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 1 Nov 2015 08:19:00 +0100 Subject: qxt-mini: make own module --- CMakeLists.txt | 3 ++- gui/CMakeLists.txt | 12 ------------ qxt-mini/CMakeLists.txt | 12 ++++++++++++ qxt-mini/qxtglobalshortcut.cpp | 1 - qxt-mini/qxtglobalshortcut_mac.cpp | 1 - qxt-mini/qxtglobalshortcut_x11.cpp | 1 - 6 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 qxt-mini/CMakeLists.txt (limited to 'gui') diff --git a/CMakeLists.txt b/CMakeLists.txt index 26cc2518..16ee3be3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 2.8.11) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/) include(CMakeParseArguments) include(opentrack-policy) +include(opentrack-qt) include(opentrack-platform) include(opentrack-macros) -include(opentrack-qt) include(opentrack-version) include(opentrack-tarball) include(opentrack-install) @@ -23,6 +23,7 @@ file(GLOB opentrack-subprojects "pose-widget/${C}" "spline-widget/${C}" "macosx/${C}" + "qxt-mini/${C}" ) foreach(i ${opentrack-subprojects}) get_filename_component(i ${i} DIRECTORY) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 19e98571..f483f695 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -14,22 +14,10 @@ opentrack_qt(opentrack) add_executable(opentrack ${opentrack-win32-executable} ${opentrack-all}) opentrack_compat(opentrack) - -if(UNIX OR APPLE) - target_include_directories(opentrack PRIVATE "${CMAKE_SOURCE_DIR}/qxt-mini") - opentrack_library(opentrack-qxt-mini ${CMAKE_SOURCE_DIR}/qxt-mini NO-LINKER-SCRIPT NO-COMPAT) - if(NOT APPLE) - target_link_libraries(opentrack-qxt-mini X11) - endif() -endif() - 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(APPLE) - SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES LINK_FLAGS "-framework Carbon -framework CoreFoundation") -endif() if(UNIX OR APPLE) target_link_libraries(opentrack opentrack-qxt-mini) endif() diff --git a/qxt-mini/CMakeLists.txt b/qxt-mini/CMakeLists.txt new file mode 100644 index 00000000..2fe5993b --- /dev/null +++ b/qxt-mini/CMakeLists.txt @@ -0,0 +1,12 @@ +if(UNIX OR APPLE) + opentrack_boilerplate(opentrack-qxt-mini + NO-LINKER-SCRIPT NO-COMPAT + COMPILE "-DQXT_BUILD -DBUILD_QXT_GUI" + ) + if(NOT APPLE) + target_link_libraries(opentrack-qxt-mini X11) + else() + set_target_properties(opentrack-qxt-mini PROPERTIES LINK_FLAGS + "-framework Carbon -framework CoreFoundation") + endif() +endif() diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp index 4b400a72..45576d37 100644 --- a/qxt-mini/qxtglobalshortcut.cpp +++ b/qxt-mini/qxtglobalshortcut.cpp @@ -1,4 +1,3 @@ -#define QXT_BUILD #include "qxtglobalshortcut.h" /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. diff --git a/qxt-mini/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp index 34de694e..b19de377 100644 --- a/qxt-mini/qxtglobalshortcut_mac.cpp +++ b/qxt-mini/qxtglobalshortcut_mac.cpp @@ -1,5 +1,4 @@ #ifdef __APPLE__ -#define QXT_BUILD #include /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. diff --git a/qxt-mini/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp index 30b71ff1..12279ac8 100644 --- a/qxt-mini/qxtglobalshortcut_x11.cpp +++ b/qxt-mini/qxtglobalshortcut_x11.cpp @@ -1,5 +1,4 @@ #ifndef __APPLE__ -#define QXT_BUILD #include "qxtglobalshortcut_p.h" /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. -- cgit v1.2.3 From e04fe7d7b412c502c30c3eaf9d54b0eebf708d2b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 1 Nov 2015 08:39:46 +0100 Subject: cmake: less boilerplate, link dynamically --- csv/CMakeLists.txt | 5 +---- gui/CMakeLists.txt | 15 ++++++++++----- opentrack-compat/CMakeLists.txt | 2 +- opentrack/CMakeLists.txt | 8 ++------ pose-widget/CMakeLists.txt | 7 +------ spline-widget/CMakeLists.txt | 7 +------ spline-widget/functionconfig.cpp | 2 +- 7 files changed, 17 insertions(+), 29 deletions(-) (limited to 'gui') 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 #include #include #include -#include "functionconfig.h" #include #include #include -- cgit v1.2.3 From 6936416b6e1905135be9b4cd35ad22affc47cc5b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 1 Nov 2015 08:52:38 +0100 Subject: resize dialogs for better visibility on Linux --- filter-accela/ftnoir_accela_filtercontrols.ui | 4 ++-- gui/main.ui | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gui') diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui index 6ec6e751..1b47ddbd 100644 --- a/filter-accela/ftnoir_accela_filtercontrols.ui +++ b/filter-accela/ftnoir_accela_filtercontrols.ui @@ -9,8 +9,8 @@ 0 0 - 501 - 359 + 557 + 338 diff --git a/gui/main.ui b/gui/main.ui index ab63e832..5b276dbb 100644 --- a/gui/main.ui +++ b/gui/main.ui @@ -7,8 +7,8 @@ 0 0 - 707 - 494 + 716 + 537 -- cgit v1.2.3