Changeset 9afb2c

Timestamp:

01/16/12 16:54:32 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

a182ba2111f3fa020edcce1f5e9192dd0ce25c56

Parents:

bdb766e7cf6b608954dc6a9dd0dfed7bd529ca9a

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-16 16:53:29+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-16 16:54:32+01:00

Message:

Fix for building qt-components on Mac OS X. Master branch.

Location:

telldus-gui

Files:

• 3rdparty/qt-components-desktop.cmake (modified) (1 diff)
• Plugins/QML/CMakeLists.txt (modified) (1 diff)

telldus-gui/3rdparty/qt-components-desktop.cmake

@@ -36 +36 @@
 QT4_AUTOMOC ( ${SRCS} )
 
+SET(LIBRARIES ${QT_LIBRARIES})
+
+IF (APPLE)
+        FIND_LIBRARY(CARBON_LIBRARY Carbon)
+        LIST(APPEND LIBRARIES ${CARBON_LIBRARY})
+ENDIF ()
+
 ADD_LIBRARY(styleplugin SHARED
         ${SRCS}
         ${MOC_SRCS}
 )
-TARGET_LINK_LIBRARIES( styleplugin ${QT_LIBRARIES} )
-
-
+TARGET_LINK_LIBRARIES( styleplugin ${LIBRARIES} )
 
 IF (WIN32)

telldus-gui/Plugins/QML/CMakeLists.txt

@@ -27 +27 @@
 IF (WIN32)
         SET(QT_COMPONENTS_OUTPUT_DIR "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Plugins/declarative")
+ELSEIF (APPLE)
+        SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/TelldusCenter.app/Contents/Plugins/declarative")
 ELSE()
         SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative")