[Uml-devel] KDE/kdesdk/umbrello

[Laurent Montel]

SVN commit 553814 by mlaurent:

Fix generate makefile
never add ${...} into kde4_add_ui3_files macro we must
name and not content of variable for the macro.
Now I can continue to fix umbrello compile


 M  +0 -23     CMakeLists.txt  
 M  +20 -21    umbrello/CMakeLists.txt  


--- trunk/KDE/kdesdk/umbrello/CMakeLists.txt #553813:553814
@@ -1,26 +1,3 @@
 project(umbrello)
 add_subdirectory( umbrello ) 
 
-
-
-
-########### install files ###############
-
-
-
-
-
-#original Makefile.am contents follow:
-
-######## kdevelop will overwrite this part!!! (begin)##########
-#
-#SUBDIRS = umbrello
-#
-######## kdevelop will overwrite this part!!! (end)############
-## not a GNU package. You can remove this line, if 
-## have all needed files, that a GNU package needs
-#AUTOMAKE_OPTIONS = foreign 
-#
-#AM_CPPFLAGS = $(QT_INCLUDES)
-#VERSION:=`cat ${PWD}/VERSION`
-#
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #553813:553814
@@ -1,3 +1,10 @@
+add_subdirectory( classparser ) 
+add_subdirectory( dialogs ) 
+add_subdirectory( clipboard ) 
+add_subdirectory( pics ) 
+add_subdirectory( codegenerators ) 
+add_subdirectory( headings ) 
+add_subdirectory( refactoring ) 
 
 macro(CREATE_VERSION _in_FILE _out_FILE)
     FILE(READ ${_in_FILE} _contents)
@@ -9,13 +16,6 @@
 macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/version.h )
 create_version(${CMAKE_SOURCE_DIR}/umbrello/VERSION version.h)
 
-add_subdirectory( classparser ) 
-add_subdirectory( dialogs ) 
-add_subdirectory( clipboard ) 
-add_subdirectory( pics ) 
-add_subdirectory( codegenerators ) 
-add_subdirectory( headings ) 
-add_subdirectory( refactoring ) 
 
 
 set(libcodegenerator_SRCS
@@ -264,22 +264,21 @@
    widget_utils.cpp 
    worktoolbar.cpp )
 
-kde4_add_ui3_files( ${umbrello_SRCS}
-	dialogs/codegenerationoptionsbase.ui 
-	dialogs/codegenerationpolicybase.ui 
-	dialogs/codegenerationwizardbase.ui 
-	dialogs/codeviewerdialogbase.ui 
-	dialogs/codevieweroptionsbase.ui 
-	dialogs/diagrampropertiespage.ui 
-	dialogs/umlrolepropertiesbase.ui 
-	codegenerators/javacodegenerationformbase.ui
-	codegenerators/cppcodegenerationformbase.ui
-	codegenerators/rubycodegenerationformbase.ui
-)
-
-
 kde4_automoc(${umbrello_SRCS})
 
+kde4_add_ui3_files( umbrello_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codegenerationoptionsbase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codegenerationpolicybase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codegenerationwizardbase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codeviewerdialogbase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/codevieweroptionsbase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/diagrampropertiespage.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/dialogs/umlrolepropertiesbase.ui 
+	${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/javacodegenerationformbase.ui
+	${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/cppcodegenerationformbase.ui
+	${CMAKE_CURRENT_SOURCE_DIR}/codegenerators/rubycodegenerationformbase.ui
+)
+
 kde4_add_executable(umbrello ${umbrello_SRCS})
 
 target_link_libraries(umbrello  ${KDE4_KIO_LIBS}  kdeprint  )