diff ui/CMakeLists.txt @ 621:5d6e86cf3b87

Fix dependency handling for messages files. This causes the messages to be recompiled when they are modified
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 20 Jun 2014 09:49:26 +0200
parents bc02ee484067
children 129e611eaf50
line wrap: on
line diff
--- a/ui/CMakeLists.txt	Thu Jun 19 17:48:10 2014 +0200
+++ b/ui/CMakeLists.txt	Fri Jun 20 09:49:26 2014 +0200
@@ -7,7 +7,8 @@
 
 include_directories(${Qt5Widgets_INCLUDE_DIRS})
 include_directories(${POLARSSL_INCLUDE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
+include_directories(${CMAKE_SOURCE_DIR}/common)
+include_directories(${CMAKE_BINARY_DIR}/common)
 add_definitions(${Qt5Widgets_DEFINITIONS})
 
 find_package(Qt5LinguistTools)
@@ -133,9 +134,9 @@
               ${CMAKE_BINARY_DIR}/common/events.rc
               ${CMAKE_BINARY_DIR}/common/MSG00407.bin
               ${CMAKE_BINARY_DIR}/common/MSG00409.bin
-       COMMAND ${MC_COMPILER} ${CMAKE_SOURCE_DIR}/common/events.mc -a -U -r ${CMAKE_BINARY_DIR}/common -h ${CMAKE_BINARY_DIR}/common
+       COMMAND ${MC_COMPILER} ${CMAKE_SOURCE_DIR}/common/events.mc -r ${CMAKE_BINARY_DIR}/common -h ${CMAKE_BINARY_DIR}/common
        DEPENDS ${CMAKE_SOURCE_DIR}/common/events.mc)
-    add_custom_target(create_events DEPENDS ${CMAKE_BINARY_DIR}/common/events.rc)
+    set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/img/icon.rc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/common/events.rc)
 endif()
 
 if(Qt5LinguistTools_FOUND)
@@ -175,10 +176,6 @@
       ${TRUSTBRIDGE_MAIN_WITH_RESOURCES})
 endif()
 
-if (WIN32)
-   add_dependencies(trustbridge create_events)
-endif()
-
 add_library(ui_common STATIC ${UICOMMON_SOURCES})
 add_library(tbadminlib STATIC ${ADMINISTRATOR_SOURCES})
 add_library(tblib STATIC ${TRUSTBRIDGE_SOURCES})

http://wald.intevation.org/projects/trustbridge/