Changeset 1e650c

Timestamp:

01/13/12 18:22:31 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

bdb766e7cf6b608954dc6a9dd0dfed7bd529ca9a

Parents:

99c2b0e158d7a587a0b2cba693c0c15a54818171

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-13 18:22:31+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-13 18:22:31+01:00

Message:

Fix compiling issues for qt-components-desktop on Windows

Location:

telldus-gui

Files:

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

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

@@ -11 +11 @@
 SET(EXTRA_FILES ${QML} ${JS} ${PNG} ${QMLDIR})
 
-QT4_WRAP_CPP( MOC_SRCS  ${HDRS} )
-QT4_AUTOMOC ( ${SRCS} )
-
-ADD_LIBRARY(styleplugin SHARED
-        ${SRCS}
-        ${MOC_SRCS}
-        ${QMLS}
-)
-TARGET_LINK_LIBRARIES( styleplugin ${QT_LIBRARIES} )
-
-
 IF (QT_COMPONENTS_OUTPUT_DIR)
         SET(QT_COMPONENTS_OUTPUT_DIR "${QT_COMPONENTS_OUTPUT_DIR}/QtDesktop")
@@ -27 +16 @@
         SET(QT_COMPONENTS_OUTPUT_DIR "QtDesktop")
 ENDIF()
-
-SET_TARGET_PROPERTIES(styleplugin PROPERTIES
-        LIBRARY_OUTPUT_DIRECTORY ${QT_COMPONENTS_OUTPUT_DIR}/plugin
-)
 
 STRING(LENGTH "${BASE_PATH}/components" BASE_LENGTH)
@@ -38 +23 @@
         STRING(SUBSTRING ${_FILE} ${BASE_LENGTH} ${_TOP_LENGTH} _OUT_FILE)
         GET_FILENAME_COMPONENT(_FILENAME ${_FILE} NAME)
-        ADD_CUSTOM_COMMAND( TARGET styleplugin
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${QT_COMPONENTS_OUTPUT_DIR}${_OUT_FILE}
+        SET(_OUTFILEPATH ${QT_COMPONENTS_OUTPUT_DIR}${_OUT_FILE})
+        LIST(APPEND SRCS ${_OUTFILEPATH})
+        ADD_CUSTOM_COMMAND(
+                OUTPUT ${_OUTFILEPATH}
+                DEPENDS ${_FILE}
+                COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${_OUTFILEPATH}
                 COMMENT "Copy ${_FILENAME} to destination"
         )
 ENDFOREACH(_FILE)
+
+QT4_WRAP_CPP( MOC_SRCS  ${HDRS} )
+QT4_AUTOMOC ( ${SRCS} )
+
+ADD_LIBRARY(styleplugin SHARED
+        ${SRCS}
+        ${MOC_SRCS}
+)
+TARGET_LINK_LIBRARIES( styleplugin ${QT_LIBRARIES} )
+
+
+
+IF (WIN32)
+        SET_TARGET_PROPERTIES(styleplugin PROPERTIES
+                PREFIX "Plugins/declarative/QtDesktop/plugin/"
+        )
+ELSE()
+        SET_TARGET_PROPERTIES(styleplugin PROPERTIES
+                LIBRARY_OUTPUT_DIRECTORY ${QT_COMPONENTS_OUTPUT_DIR}/plugin
+        )
+ENDIF()

telldus-gui/Plugins/QML/CMakeLists.txt

@@ -25 +25 @@
 INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )
 
-SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative")
+IF (WIN32)
+        SET(QT_COMPONENTS_OUTPUT_DIR "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Plugins/declarative")
+ELSE()
+        SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative")
+ENDIF()
 INCLUDE( ${CMAKE_SOURCE_DIR}/3rdparty/qt-components-desktop.cmake NO_POLICY_SCOPE )