jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Micke Prag 2012-01-16 16:53:29 +01:00
parent bdb766e7cf
commit 9afb2cbbac
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
telldus-gui/3rdparty/qt-components-desktop.cmake vendored
View file

@ -35,13 +35,18 @@ ENDFOREACH(_FILE)
QT4_WRAP_CPP( MOC_SRCS ${HDRS} ) QT4_WRAP_CPP( MOC_SRCS ${HDRS} )
QT4_AUTOMOC ( ${SRCS} ) QT4_AUTOMOC ( ${SRCS} )
SET(LIBRARIES ${QT_LIBRARIES})
IF (APPLE)
FIND_LIBRARY(CARBON_LIBRARY Carbon)
LIST(APPEND LIBRARIES ${CARBON_LIBRARY})
ENDIF ()
ADD_LIBRARY(styleplugin SHARED ADD_LIBRARY(styleplugin SHARED
${SRCS} ${SRCS}
${MOC_SRCS} ${MOC_SRCS}
) )
TARGET_LINK_LIBRARIES( styleplugin ${QT_LIBRARIES} ) TARGET_LINK_LIBRARIES( styleplugin ${LIBRARIES} )
IF (WIN32) IF (WIN32)
SET_TARGET_PROPERTIES(styleplugin PROPERTIES SET_TARGET_PROPERTIES(styleplugin PROPERTIES

2
telldus-gui/Plugins/QML/CMakeLists.txt
View file

@ -26,6 +26,8 @@ INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )
IF (WIN32) IF (WIN32)
SET(QT_COMPONENTS_OUTPUT_DIR "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Plugins/declarative") 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() ELSE()
SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative") SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative")
ENDIF() ENDIF()