From a1d93782b084354821dcb6d6cc03fc449b4d9f9a Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 31 Oct 2015 18:41:48 +0100
Subject: fix osx install bundle order

---
 cmake/opentrack-install.cmake | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'cmake')

diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake
index 8e3d0420..598572fa 100644
--- a/cmake/opentrack-install.cmake
+++ b/cmake/opentrack-install.cmake
@@ -15,13 +15,3 @@ install(FILES
     "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll"
     "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe"
     DESTINATION .  ${opentrack-perms})
-
-if(APPLE)
-    install(CODE "
-        execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\"
-                                        \"${CMAKE_SOURCE_DIR}/macosx\"
-                                        \"${CMAKE_INSTALL_PREFIX}\"
-                                        \"${CMAKE_BINARY_DIR}\"
-                                        \"${OPENTRACK_COMMIT}\")
-    ")
-endif()
-- 
cgit v1.2.3


From 882dae825773963ef44bfee61ca990fddbb94d02 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 1 Nov 2015 08:18:41 +0100
Subject: cmake: fix NO-LINKER-SCRIPT

typo
---
 cmake/opentrack-macros.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmake')

diff --git a/cmake/opentrack-macros.cmake b/cmake/opentrack-macros.cmake
index df19ddf0..e171a6fb 100644
--- a/cmake/opentrack-macros.cmake
+++ b/cmake/opentrack-macros.cmake
@@ -50,9 +50,10 @@ macro(opentrack_library n dir)
         add_library(${n} ${link-mode} ${${n}-all})
         set(link-mode)
         if(NOT opentrack-foolib_NO-COMPAT)
-            target_link_libraries(${n} opentrack-api ${MY_QT_LIBS} opentrack-compat)
+            target_link_libraries(${n} opentrack-api opentrack-compat)
         endif()
-        if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND NOT NO-LINKER-SCRIPT)
+        target_link_libraries(${n} ${MY_QT_LIBS})
+        if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND NOT opentrack-foolib_NO-LINKER-SCRIPT)
             SET_TARGET_PROPERTIES(${n} PROPERTIES
                 LINK_FLAGS "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} -Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack-compat/${version-script}-version-script.txt\""
                 COMPILE_FLAGS "${opentrack-foolib_COMPILE} ${opentrack-foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden"
-- 
cgit v1.2.3


From 8151bc76140b1e97f656101254e3a4e2d164129a Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 1 Nov 2015 08:20:07 +0100
Subject: cmake: nuke -rdynamic

---
 cmake/opentrack-platform.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'cmake')

diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index aac3a2b8..c659e4c0 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -58,3 +58,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR APPLE)
 endif()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
+
+# nix -rdynamic passed from Linux-GNU.cmake
+if(CMAKE_COMPILER_IS_GNUCXX)
+    set(__LINUX_COMPILER_GNU 1)
+    set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
+    set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+endif()
-- 
cgit v1.2.3


From 73921613ddddc8d1f8e0caed21ab8dd490a74eb1 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 1 Nov 2015 08:35:17 +0100
Subject: cmake: add current module name to preprocessor vars

---
 cmake/opentrack-macros.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cmake')

diff --git a/cmake/opentrack-macros.cmake b/cmake/opentrack-macros.cmake
index e171a6fb..e43dc3b5 100644
--- a/cmake/opentrack-macros.cmake
+++ b/cmake/opentrack-macros.cmake
@@ -66,6 +66,8 @@ macro(opentrack_library n dir)
             set_target_properties(${n} PROPERTIES LINK_FLAGS "${link-flags} ${opentrack-foolib_LINK}" COMPILE_FLAGS "${opentrack-foolib_COMPILE}")
             set(link-flags)
         endif()
+        string(REPLACE "-" "_" n_ ${n})
+        target_compile_definitions(${n} PRIVATE "BUILD_${n_}")
         if(NOT opentrack-foolib_STATIC)
             install(TARGETS ${n} RUNTIME DESTINATION . LIBRARY DESTINATION .)
         endif()
-- 
cgit v1.2.3