diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | qxt-mini/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut.cpp | 1 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut_mac.cpp | 1 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut_x11.cpp | 1 |
6 files changed, 14 insertions, 16 deletions
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 <Carbon/Carbon.h> /**************************************************************************** ** 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. |