Git commit 042ef29619739f85c461b8c0ee3a8510fd0604ef by Urs Wolfer.
Committed on 16/02/2008 at 17:27.
Pushed by whiting into branch 'master'.

Clean mess with trailing spaces, indentation, lower / uppercase, double-spa=
ces... Also fix DCOP stuff. This should had happened before trunk had been =
converted to CMake...

svn path=3D/trunk/KDE/kdesdk/cmake/scripts/; revision=3D775768

M  +103  -105  cmake-utils/scripts/am2cmake

http://commits.kde.org/kde-dev-scripts/042ef29619739f85c461b8c0ee3a8510fd06=
04ef

diff --git a/cmake-utils/scripts/am2cmake b/cmake-utils/scripts/am2cmake
index 313caac..26beb85 100755
--- a/cmake-utils/scripts/am2cmake
+++ b/cmake-utils/scripts/am2cmake
@@ -556,30 +556,30 @@ class CMakeFile
 =

       file=3DFile.new(@listsFile, "w+");
       if @amFile=3D=3D"Makefile.am" && $buildType =3D=3D BuildKDE3   # the=
 toplevel Makefile.am
-          file.printf("FIND_PACKAGE(KDE3 REQUIRED)\n\n")
-          file.printf("SET(CMAKE_VERBOSE_MAKEFILE ON)\n\n")
-          file.printf("ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE3_DEFINITION=
S})\n\n")
-          file.printf("LINK_DIRECTORIES(${KDE3_LIB_DIR})\n\n")
+          file.printf("find_package(KDE3 REQUIRED)\n\n")
+          file.printf("set(CMAKE_VERBOSE_MAKEFILE ON)\n\n")
+          file.printf("add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITION=
S})\n\n")
+          file.printf("link_directories(${KDE3_LIB_DIR})\n\n")
 =

       end
 =

       if !@configHeaders.empty?
-         @configHeaders.each{ |header| file.printf("CONFIGURE_FILE(${CMAKE=
_CURRENT_SOURCE_DIR}/#{header}.cmake ${CMAKE_CURRENT_BINARY_DIR}/#{header} =
)\n\n") }
+         @configHeaders.each{ |header| file.printf("configure_file(${CMAKE=
_CURRENT_SOURCE_DIR}/#{header}.cmake ${CMAKE_CURRENT_BINARY_DIR}/#{header})=
\n\n") }
       end
 =

       if not @subDirs.empty?
-         @subDirs.each{ |dir| file.printf("ADD_SUBDIRECTORY( %s ) \n", dir=
)}
+         @subDirs.each{ |dir| file.printf("add_subdirectory(%s)\n", dir)}
          file.printf("\n")
       end
       if not @skippedSubDirs.empty?
-         @skippedSubDirs.each{ |dir| file.printf("MESSAGE(STATUS \"${CMAKE=
_CURRENT_SOURCE_DIR}: skipped subdir %s\")\n", dir)}
+         @skippedSubDirs.each{ |dir| file.printf("message(STATUS \"${CMAKE=
_CURRENT_SOURCE_DIR}: skipped subdir %s\")\n", dir)}
       end
 =

 =

       if not @includeDirs.empty?
-         file.printf("INCLUDE_DIRECTORIES( ")
+         file.printf("include_directories(")
          @includeDirs.each{ |dir| file.printf("%s ", dir) }
-         file.printf(" )\n\n")
+         file.printf(")\n\n")
       end
       @targets.each do |buildTarget|
          file.printf("\n########### next target ###############\n\n")
@@ -615,113 +615,113 @@ class CMakeFile
                   needToCreateDummyFile=3Dtrue if not FileTest.exists?(@pa=
th+"/dummy.cpp")
                end
             end
-            file.printf("   )\n\n")
+            file.printf(")\n\n")
             =

             if $buildType =3D=3D BuildKDE3
-               file.printf("KDE3_AUTOMOC(${%s})\n\n", srcsName)
+               file.printf("kde3_automoc(${%s})\n\n", srcsName)
             end
 =

             if needToCreateDummyFile
 #                  printf("creating dummy file in #{@path} ________\n")
-               file.printf("FILE(WRITE dummy.cpp \"//autogenerated file by=
 cmake\\n\")\n")
+               file.printf("file(WRITE dummy.cpp \"//autogenerated file by=
 cmake\\n\")\n")
             end
          end
 =

          if not buildTarget.uis.empty?
-            file.printf("SET( %s\n", uisName)
-            buildTarget.uis.each{ |currentFile| file.printf("   %s\n", cur=
rentFile)}
-            file.printf("   )\n\n")
-            file.printf("KDE3_ADD_UI_FILES(%s ${%s} )\n\n", srcsName, uisN=
ame)
+            file.printf("set(%s\n", uisName)
+            buildTarget.uis.each{ |currentFile| file.printf("    %s\n", cu=
rrentFile)}
+            file.printf(")\n\n")
+            file.printf("kde3_add_ui_files(%s ${%s})\n\n", srcsName, uisNa=
me)
          end
 =

          if not buildTarget.skels.empty?
-            file.printf("SET( %s\n", skelsName)
-            buildTarget.skels.each{ |currentFile| file.printf("   %s\n", c=
urrentFile)}
-            file.printf("   )\n\n")
+            file.printf("set(%s\n", skelsName)
+            buildTarget.skels.each{ |currentFile| file.printf("    %s\n", =
currentFile)}
+            file.printf(")\n\n")
 =

-            file.printf("KDE3_ADD_DCOP_SKELS(%s ${%s})\n\n", srcsName, ske=
lsName)
+            file.printf("kde3_add_dcop_skels(%s ${%s})\n\n", srcsName, ske=
lsName)
          end
 =

          if not buildTarget.stubs.empty?
-            file.printf("SET( %s\n", stubsName)
-            buildTarget.stubs.each{ |currentFile| file.printf("   %s\n", c=
urrentFile)}
-            file.printf("   )\n\n")
+            file.printf("set(%s\n", stubsName)
+            buildTarget.stubs.each{ |currentFile| file.printf("    %s\n", =
currentFile)}
+            file.printf(")\n\n")
 =

-            file.printf("KDE3_ADD_DCOP_STUBS(%s ${%s})\n\n", srcsName, stu=
bsName)
+            file.printf("kde3_add_dcop_stubs(%s ${%s})\n\n", srcsName, stu=
bsName)
          end
 =

          if not buildTarget.kcfgs.empty?
-            file.printf("SET( %s\n", kcfgsName)
-            buildTarget.kcfgs.each{ |currentFile| file.printf("   %s\n", c=
urrentFile)}
-            file.printf("   )\n\n")
+            file.printf("set(%s\n", kcfgsName)
+            buildTarget.kcfgs.each{ |currentFile| file.printf("    %s\n", =
currentFile)}
+            file.printf(")\n\n")
 =

-            file.printf("KDE3_ADD_KCFG_FILES(%s ${%s})\n\n", srcsName, kcf=
gsName)
+            file.printf("kde3_add_kcfg_files(%s ${%s})\n\n", srcsName, kcf=
gsName)
          end
 =

          if buildTarget.type=3D=3DSharedLib
-            file.printf("ADD_LIBRARY(%s SHARED ${%s})\n\n", buildTarget.na=
me, srcsName)
-            file.printf("TARGET_LINK_LIBRARIES(%s ", buildTarget.name)
+            file.printf("add_library(%s SHARED ${%s})\n\n", buildTarget.na=
me, srcsName)
+            file.printf("target_link_libraries(%s", buildTarget.name)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("SET_TARGET_PROPERTIES(%s PROPERTIES VERSION 4.2.0=
 SOVERSION 4 )\n", buildTarget.name)
-            file.printf("INSTALL(TARGETS %s DESTINATION lib )\n\n", buildT=
arget.name)
+            file.printf("set_target_properties(%s PROPERTIES VERSION 4.2.0=
 SOVERSION 4)\n", buildTarget.name)
+            file.printf("install(TARGETS %s DESTINATION lib)\n\n", buildTa=
rget.name)
          elsif buildTarget.type=3D=3DStaticLib
-            file.printf("ADD_LIBRARY(%s STATIC ${%s})\n\n", buildTarget.na=
me, srcsName)
+            file.printf("add_library(%s STATIC ${%s})\n\n", buildTarget.na=
me, srcsName)
          elsif buildTarget.type=3D=3DPart
             if buildTarget.stdPrefix
-               file.printf("KDE3_ADD_KPART(%s WITH_PREFIX ${%s})\n\n", bui=
ldTarget.name, srcsName)
+               file.printf("kde3_add_kpart(%s WITH_PREFIX ${%s})\n\n", bui=
ldTarget.name, srcsName)
             else
-               file.printf("KDE3_ADD_KPART(%s ${%s})\n\n", buildTarget.nam=
e, srcsName)
+               file.printf("kde3_add_kpart(%s ${%s})\n\n", buildTarget.nam=
e, srcsName)
             end
-            file.printf("TARGET_LINK_LIBRARIES(%s ", buildTarget.name)
+            file.printf("target_link_libraries(%s", buildTarget.name)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("INSTALL(TARGETS %s DESTINATION lib/kde3)\n\n", bu=
ildTarget.name)
+            file.printf("install(TARGETS %s DESTINATION lib/kde3)\n\n", bu=
ildTarget.name)
          elsif buildTarget.type=3D=3DKDEInit
-            file.printf("KDE3_ADD_KDEINIT_EXECUTABLE( %s ${%s})\n\n", buil=
dTarget.name, srcsName)
+            file.printf("kde3_add_kdeinit_executable(%s ${%s})\n\n", build=
Target.name, srcsName)
 =

-            file.printf("TARGET_LINK_LIBRARIES(kdeinit_%s ", buildTarget.n=
ame)
+            file.printf("target_link_libraries(kdeinit_%s", buildTarget.na=
me)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("INSTALL(TARGETS kdeinit_%s DESTINATION lib )\n\n"=
, buildTarget.name)
+            file.printf("install(TARGETS kdeinit_%s DESTINATION lib)\n\n",=
 buildTarget.name)
 =

-            file.printf("TARGET_LINK_LIBRARIES( %s kdeinit_%s )\n", buildT=
arget.name, buildTarget.name)
+            file.printf("target_link_libraries(%s kdeinit_%s)\n", buildTar=
get.name, buildTarget.name)
 =

-            file.printf("INSTALL(TARGETS %s DESTINATION bin)\n", buildTarg=
et.name)
+            file.printf("install(TARGETS %s DESTINATION bin)\n", buildTarg=
et.name)
 =

          else  #executable
             if $buildType =3D=3D BuildNoKDE
 =

-               file.printf("ADD_EXECUTABLE(%s ${%s})\n\n", buildTarget.nam=
e, srcsName)
+               file.printf("add_executable(%s ${%s})\n\n", buildTarget.nam=
e, srcsName)
 =

-               file.printf("TARGET_LINK_LIBRARIES(%s ", buildTarget.name)
+               file.printf("target_link_libraries(%s", buildTarget.name)
                buildTarget.libs.each { |currentLib| file.printf(" %s", cur=
rentLib) }
-               file.printf(" )\n\n")
+               file.printf(")\n\n")
 =

                if buildTarget.install
-                  file.printf("INSTALL(TARGETS %s DESTINATION bin)\n\n", b=
uildTarget.name)
+                  file.printf("install(TARGETS %s DESTINATION bin)\n\n", b=
uildTarget.name)
                end
 =

             else
                if buildTarget.test
-                  file.printf("IF(KDE3_BUILD_TESTS)\n\n")
+                  file.printf("if(KDE3_BUILD_TESTS)\n\n")
                end
 =

-               file.printf("KDE3_ADD_EXECUTABLE(%s ${%s})\n\n", buildTarge=
t.name, srcsName)
+               file.printf("kde3_add_executable(%s ${%s})\n\n", buildTarge=
t.name, srcsName)
 =

-               file.printf("TARGET_LINK_LIBRARIES(%s ", buildTarget.name)
+               file.printf("target_link_libraries(%s", buildTarget.name)
                buildTarget.libs.each { |currentLib| file.printf(" %s", cur=
rentLib) }
-               file.printf(" )\n\n")
+               file.printf(")\n\n")
 =

                if buildTarget.install
-                  file.printf("INSTALL( TARGETS %s DESTINATION bin)\n\n", =
buildTarget.name)
+                  file.printf("install(TARGETS %s DESTINATION bin)\n\n", b=
uildTarget.name)
                end
 =

                if buildTarget.test
-                  file.printf("ENDIF(KDE3_BUILD_TESTS)\n")
+                  file.printf("endif(KDE3_BUILD_TESTS)\n")
                end
 =

             end
@@ -733,12 +733,12 @@ class CMakeFile
       file.printf("\n########### install files ###############\n\n")
 =

       @installs.each do |key, install|
-         file.printf("INSTALL(FILES  %s DESTINATION %s )\n", install.files=
, install.location)
+         file.printf("install(FILES %s DESTINATION %s)\n", install.files, =
install.location)
       end
       file.printf("\n")
 =

       if @installIcons
-         file.printf("KDE3_INSTALL_ICONS( %s )\n\n",@iconDir )
+         file.printf("kde3_install_icons(%s)\n\n", @iconDir)
       end
 =

       file.printf("\n\n#original Makefile.am contents follow:\n\n")
@@ -761,18 +761,18 @@ class CMakeFile
       end
 =

       if not @includeDirs.empty?
-         file.printf("include_directories( ")
+         file.printf("include_directories(")
          @includeDirs.each{ |dir| file.printf("%s ", dir) }
-         file.printf(" )\n\n")
+         file.printf(")\n\n")
       end
 =

 =

       if !@configHeaders.empty?
-         @configHeaders.each{ |header| file.printf("configure_file(${CMAKE=
_CURRENT_SOURCE_DIR}/#{header}.cmake ${CMAKE_CURRENT_BINARY_DIR}/#{header} =
)\n\n") }
+         @configHeaders.each{ |header| file.printf("configure_file(${CMAKE=
_CURRENT_SOURCE_DIR}/#{header}.cmake ${CMAKE_CURRENT_BINARY_DIR}/#{header})=
\n\n") }
       end
 =

       if not @subDirs.empty?
-         @subDirs.each{ |dir| file.printf("add_subdirectory( %s )\n", dir)}
+         @subDirs.each{ |dir| file.printf("add_subdirectory(%s)\n", dir)}
          file.printf("\n")
       end
       if not @skippedSubDirs.empty?
@@ -808,37 +808,37 @@ class CMakeFile
             $convFile.printf("# %s: %s\n\n", @amFile, buildTarget.name)
 =

             if buildTarget.sources.empty?
-               $convFile.printf("set(%s \n", srcsName)
-               buildTarget.sources.each { |currentFile| $convFile.printf("=
  ${CMAKE_SOURCE_DIR}/%s%s\n", @path, currentFile) }
+               $convFile.printf("set(%s\n", srcsName)
+               buildTarget.sources.each { |currentFile| $convFile.printf("=
    ${CMAKE_SOURCE_DIR}/%s%s\n", @path, currentFile) }
                $convFile.printf(")\n\n", srcsName)
             end
             if not buildTarget.uis.empty?
-               $convFile.printf("set( %s\n", uisName)
+               $convFile.printf("set(%s\n", uisName)
                buildTarget.uis.each{ |currentFile| $convFile.printf("%s\n"=
, currentFile)}
                $convFile.printf(")\n\n")
             end
             if not buildTarget.ui3s.empty?
-               $convFile.printf("set( %s\n", ui3sName)
+               $convFile.printf("set(%s\n", ui3sName)
                buildTarget.ui3s.each{ |currentFile| $convFile.printf("%s\n=
", currentFile)}
                $convFile.printf(")\n\n")
             end
             if not buildTarget.qrcs.empty?
-               $convFile.printf("set( %s\n", qrcsName)
+               $convFile.printf("set(%s\n", qrcsName)
                buildTarget.qrcs.each{ |currentFile| $convFile.printf("%s\n=
", currentFile)}
                $convFile.printf(")\n\n")
             end
             if not buildTarget.skels.empty?
-               $convFile.printf("set( %s\n", skelsName)
+               $convFile.printf("set(%s\n", skelsName)
                buildTarget.skels.each{ |currentFile| $convFile.printf("%s\=
n", currentFile)}
                $convFile.printf(")\n\n")
             end
             if not buildTarget.stubs.empty?
-               $convFile.printf("set( %s\n", stubsName)
+               $convFile.printf("set(%s\n", stubsName)
                buildTarget.stubs.each{ |currentFile| $convFile.printf("%s\=
n", currentFile)}
                $convFile.printf(")\n\n")
             end
             if not buildTarget.kcfgs.empty?
-               $convFile.printf("set( %s\n", kcfgsName)
+               $convFile.printf("set(%s\n", kcfgsName)
                buildTarget.kcfgs.each{ |currentFile| $convFile.printf("%s\=
n", currentFile)}
                $convFile.printf(")\n\n")
             end
@@ -850,12 +850,12 @@ class CMakeFile
          end
 =

          if not buildTarget.sources.empty?
-            file.printf("set(%s ", srcsName)
+            file.printf("set(%s", srcsName)
             needToCreateDummyFile=3Dfalse
             buildTarget.sources.each do |currentFile|
                # if there are more than 3 files, print each of them on its=
 own line
                file.printf("\n   ") if buildTarget.sources.size>3
-               file.printf("%s ", currentFile)
+               file.printf(" %s", currentFile)
                if currentFile=3D=3D"dummy.cpp"
 =

                   needToCreateDummyFile=3Dtrue if not FileTest.exists?(@pa=
th+"/dummy.cpp")
@@ -870,75 +870,75 @@ class CMakeFile
          end
 =

          if not buildTarget.uis.empty?
-            file.printf("kde4_add_ui_files(%s ", srcsName )
+            file.printf("kde4_add_ui_files(%s", srcsName)
             buildTarget.uis.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
                file.printf("\n   ") if buildTarget.uis.size>3
-               file.printf("%s ", currentFile)
+               file.printf(" %s", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if not buildTarget.ui3s.empty?
-            file.printf("kde4_add_ui3_files(%s ", srcsName)
+            file.printf("kde4_add_ui3_files(%s", srcsName)
             buildTarget.ui3s.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
                file.printf("\n   ") if buildTarget.ui3s.size>3
-               file.printf("%s ", currentFile)
+               file.printf(" %s", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if not buildTarget.qrcs.empty?
-            file.printf("qt4_add_resources(%s ", srcsName)
+            file.printf("qt4_add_resources(%s", srcsName)
             buildTarget.qrcs.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
                file.printf("\n   ") if buildTarget.qrcs.size>3
-               file.printf("%s ", currentFile)
+               file.printf(" %s", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if not buildTarget.skels.empty?
-            file.printf("#kde4_add_dcop_skels(%s );\n", srcsName)
-            file.printf("MESSAGE(STATUS \"DCOP stuff was remove into kde4,=
 convert it to dbus please.kde4_add_dcop_skels macro doesn't exist now. We =
keep it just to remember to port to dbus\")\n")
+            file.printf("message(STATUS \"DCOP has been removed in KDE 4; =
port code to D-Bus. kde4_add_dcop_skels macro does not exist anymore. We ke=
ep it just to remember to port to D-Bus.\")\n")
+            file.printf("#kde4_add_dcop_skels(%s\n", srcsName)
             buildTarget.skels.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
-               file.printf("\n   ") if buildTarget.skels.size>3
+               file.printf("\n#   ") if buildTarget.skels.size>3
                file.printf("%s ", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if not buildTarget.stubs.empty?
-            file.printf("#kde4_add_dcop_stubs(%s )\n", srcsName)
-            file.printf("MESSAGE(STATUS \"DCOP stuff was remove into kde4,=
 convert it to dbus please. kde4_add_dcop_stubs doen't exist. We keep it to=
 remember to port to dbus\")\n")
+            file.printf("message(STATUS \"DCOP has been removed in KDE 4; =
port code to D-Bus. kde4_add_dcop_skels macro does not exist anymore. We ke=
ep it just to remember to port to D-Bus.\")\n")
+            file.printf("#kde4_add_dcop_stubs(%s\n", srcsName)
             buildTarget.stubs.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
-               file.printf("\n   ") if buildTarget.stubs.size>3
-               file.printf("%s ", currentFile)
+               file.printf("\n#   ") if buildTarget.stubs.size>3
+               file.printf(" %s", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if not buildTarget.kcfgs.empty?
-            file.printf("kde4_add_kcfg_files(%s )", srcsName)
+            file.printf("kde4_add_kcfg_files(%s)", srcsName)
             buildTarget.kcfgs.each do |currentFile| =

                # if there are more than 3 files, print each of them on its=
 own line
                file.printf("\n   ") if buildTarget.kcfgs.size>3
-               file.printf("%s ", currentFile)
+               file.printf(" %s", currentFile)
             end
             file.printf(")\n\n")
          end
 =

          if buildTarget.type=3D=3DSharedLib
             file.printf("kde4_add_library(%s SHARED ${%s})\n\n", buildTarg=
et.name, srcsName)
-            file.printf("target_link_libraries(%s ", buildTarget.name)
+            file.printf("target_link_libraries(%s", buildTarget.name)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("set_target_properties(%s PROPERTIES VERSION %d.%d=
.%d SOVERSION %d )\n", buildTarget.name, buildTarget.versionNumberMajor, bu=
ildTarget.versionNumberMinor, buildTarget.versionNumberPatch, buildTarget.v=
ersionNumberMajor)
-            file.printf("install(TARGETS %s DESTINATION ${LIB_INSTALL_DIR}=
 )\n\n", buildTarget.name)
+            file.printf("set_target_properties(%s PROPERTIES VERSION %d.%d=
.%d SOVERSION %d)\n", buildTarget.name, buildTarget.versionNumberMajor, bui=
ldTarget.versionNumberMinor, buildTarget.versionNumberPatch, buildTarget.ve=
rsionNumberMajor)
+            file.printf("install(TARGETS %s DESTINATION ${LIB_INSTALL_DIR}=
)\n\n", buildTarget.name)
 =

          elsif buildTarget.type=3D=3DStaticLib
             file.printf("kde4_add_library(%s STATIC ${%s})\n\n", buildTarg=
et.name, srcsName)
@@ -949,21 +949,21 @@ class CMakeFile
             else
                file.printf("kde4_add_plugin(%s ${%s})\n\n", buildTarget.na=
me, srcsName)
             end
-            file.printf("target_link_libraries(%s ", buildTarget.name)
+            file.printf("target_link_libraries(%s", buildTarget.name)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("install(TARGETS %s DESTINATION ${PLUGIN_INSTALL_D=
IR} )\n\n", buildTarget.name)
+            file.printf("install(TARGETS %s DESTINATION ${PLUGIN_INSTALL_D=
IR})\n\n", buildTarget.name)
          elsif buildTarget.type=3D=3DKDEInit
-            file.printf("kde4_add_kdeinit_executable( %s ${%s})\n\n", buil=
dTarget.name, srcsName)
+            file.printf("kde4_add_kdeinit_executable(%s ${%s})\n\n", build=
Target.name, srcsName)
 =

-            file.printf("target_link_libraries(kdeinit_%s ", buildTarget.n=
ame)
+            file.printf("target_link_libraries(kdeinit_%s", buildTarget.na=
me)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

-            file.printf("install(TARGETS kdeinit_%s DESTINATION ${LIB_INST=
ALL_DIR} )\n\n", buildTarget.name)
+            file.printf("install(TARGETS kdeinit_%s DESTINATION ${LIB_INST=
ALL_DIR})\n\n", buildTarget.name)
 =

-            file.printf("target_link_libraries( %s kdeinit_%s )\n", buildT=
arget.name, buildTarget.name)
+            file.printf("target_link_libraries(%s kdeinit_%s)\n", buildTar=
get.name, buildTarget.name)
 =

             file.printf("install(TARGETS %s DESTINATION ${BIN_INSTALL_DIR}=
)\n", buildTarget.name)
 =

@@ -974,9 +974,9 @@ class CMakeFile
 =

             file.printf("kde4_add_executable(%s ${%s})\n\n", buildTarget.n=
ame, srcsName)
 =

-            file.printf("target_link_libraries(%s ", buildTarget.name)
+            file.printf("target_link_libraries(%s", buildTarget.name)
             buildTarget.libs.each { |currentLib| file.printf(" %s", curren=
tLib) }
-            file.printf(" )\n\n")
+            file.printf(")\n\n")
 =

             if buildTarget.install
                file.printf("install(TARGETS %s DESTINATION ${BIN_INSTALL_D=
IR})\n\n", buildTarget.name)
@@ -993,16 +993,16 @@ class CMakeFile
       file.printf("\n########### install files ###############\n\n")
 =

       @installs.each do |key, install|
-         file.printf("install( FILES %s DESTINATION %s )\n",install.files,=
 install.location)
+         file.printf("install(FILES %s DESTINATION %s)\n", install.files, =
install.location)
       end
       file.printf("\n")
 =

       if @installIcons
-		 file.printf("kde4_install_icons( ${ICON_INSTALL_DIR} )\n\n" )
+		 file.printf("kde4_install_icons(${ICON_INSTALL_DIR})\n\n")
       end
       =

       if @installDoc
-	         file.printf("kde4_create_handbook(index.docbook INSTALL_DESTINAT=
ION ${HTML_INSTALL_DIR}/en)\n\n" )
+	         file.printf("kde4_create_handbook(index.docbook INSTALL_DESTINAT=
ION ${HTML_INSTALL_DIR}/en)\n\n")
       end
       #if @createDoxygenDocs
       #   file.printf("kde4_create_doxygen_docs( ")
@@ -1087,6 +1087,4 @@ $configHeaders.each{|inFile| infoFile.printf("%s\n", =
inFile)}
 infoFile.printf("\n.in.in-Files\n")
 $configInIns.each{|inFile| infoFile.printf("%s\n", inFile)}
 =

-
 Dir["**/Makefile.am"].each{ |currentFile| convertAmFile(currentFile)}
-