From a2682c3265c4f891e7baf740c08d19e01cd6d8d8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 23 Jul 2015 11:07:17 +0200
Subject: no longer add extra file to modules

Modules now link to opentrack-api so this isn't needed
---
 CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee0e932c..19fb2668 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,11 +76,8 @@ endif()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
 
-# qt broken as usual
-set(EXTRA-MOCS opentrack/options.hpp)
-
 macro(opentrack_module n dir)
-    file(GLOB ${n}-c ${dir}/*.cpp ${dir}/*.c ${dir}/*.h ${dir}/*.hpp ${EXTRA-MOCS})
+    file(GLOB ${n}-c ${dir}/*.cpp ${dir}/*.c ${dir}/*.h ${dir}/*.hpp)
     file(GLOB ${n}-res ${dir}/*.rc)
     foreach(f ${n}-res)
         set_source_files_properties(${f} PROPERTIES LANGUAGE RC)
-- 
cgit v1.2.3


From ca1c7afaf6530c64c118105f167c2d08d6f13e05 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 24 Jul 2015 09:15:00 +0200
Subject: x-plane plugin osx fixes

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19fb2668..17179cb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,9 @@ if(SDK_XPLANE)
     if(APPLE)
         SET_TARGET_PROPERTIES(opentrack-xplane-plugin PROPERTIES
                               COMPILE_FLAGS "-iframework ${SDK_XPLANE}/Libraries/Mac/ -DAPL -DXPLM200 -DXPLM210 -framework XPLM -framework XPWidgets"
-                              LINK_FLAGS "-F${SDK_XPLANE}/Libraries/Mac/ -framework XPLM -framework XPWidgets")
+                              LINK_FLAGS "-F${SDK_XPLANE}/Libraries/Mac/ -framework XPLM -framework XPWidgets"
+                              LIBRARY_OUTPUT_NAME "opentrack.xpl"
+                              PREFIX "" SUFFIX "")
     endif()
     if(UNIX AND NOT APPLE)
         target_link_libraries(opentrack-xplane-plugin rt)
-- 
cgit v1.2.3