[Kde-pim] KDE/kdepimlibs

[Christian Ehrlicher]

Ingo Klöcker schrieb:
> Hi,
> 
> on Wednesday 19 July 2006, Christian Ehrlicher wrote:
>> SVN commit 564286 by chehrlic:
>>
>> fix msvc compile (msvc can't handle C99 correct)
>>
>> CCMAIL: kde-pim at kde.org
>>
>>  M  +4 -0      ConfigureChecks.cmake
>>  M  +5 -0      config.h.cmake
>>  M  +3 -3      kcal/CMakeLists.txt
> 
> The changes in kcal/CMakeLists.txt 
> (http://websvn.kde.org/trunk/KDE/kdepimlibs/kcal/CMakeLists.txt?view=diff&r1=564285&r2=564286)
> 
> =====
> --- trunk/KDE/kdepimlibs/kcal/CMakeLists.txt	2006/07/19 19:12:34	564285
> +++ trunk/KDE/kdepimlibs/kcal/CMakeLists.txt	2006/07/19 19:25:58	564286
> @@ -173,8 +173,8 @@
>     ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h 
>     COMMAND 
>     ${CMAKE_COMMAND} 
> -   -DTOPS:FILEPATH=${CMAKE_SOURCE_DIR}
> -   -DTOPB:FILEPATH=${CMAKE_BINARY_DIR}
> +   -DTOPS:FILEPATH="${CMAKE_SOURCE_DIR}"
> +   -DTOPB:FILEPATH="${CMAKE_BINARY_DIR}"
>     -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
>     -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
>     DEPENDS
> @@ -189,7 +189,7 @@
>     ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h 
>     COMMAND 
>     ${CMAKE_COMMAND} 
> -   -DTOP:FILEPATH=${CMAKE_SOURCE_DIR}
> +   -DTOP:FILEPATH="${CMAKE_SOURCE_DIR}"
>     -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
>     -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
>  )
> =====
> 
> break compilation (on Linux) if the source directory contains spaces.
> The problem is that the space in ${CMAKE_SOURCE_DIR} and
> ${CMAKE_BINARY_DIR} is already quoted correctly (with a backslash). The
> additional double quotes quote the backslash and make cmake use the path
> with the backslash-quoted space as path name.
> 
> Example:
> Source directory is
>   /home/ingo/svn/kde 4/trunk/KDE/kdepimlibs
> Then ${CMAKE_SOURCE_DIR} is
>   /home/ingo/svn/kde\ 4/trunk/KDE/kdepimlibs
> 
> This leads to the following command being executed:
> 
> cd /home/ingo/compiled/kde\ 4/trunk/KDE/kdepimlibs/kcal 
> && /usr/bin/cmake -DTOPS:FILEPATH="/home/ingo/svn/kde\ 
> 4/trunk/KDE/kdepimlibs" -DTOPB:FILEPATH="/home/ingo/compiled/kde\ 
> 4/trunk/KDE/kdepimlibs" -DKDE_FILE_H_FILE:FILEPATH=/home/ingo/compiled/kde\ 
> 4/trunk/KDE/kdepimlibs/kcal/libical/src/libical/ical.h -P /home/ingo/svn/kde\ 
> 4/trunk/KDE/kdepimlibs/kcal/ical_file.cmake
> CMake Error: Error in cmake code at
> /home/ingo/svn/kde 4/trunk/KDE/kdepimlibs/kcal/ical_file.cmake:35:
> FILE Internal CMake error when trying to open file: /home/ingo/svn/kde\ 
> 4/trunk/KDE/kdepimlibs/kcal/libical/src/libical/icalversion.h for reading.
> 
> Reverting the above changes, i.e. removing the double quotes again, fix
> compilation. So if the double quotes are really necessary on Windows (I
> don't understand why because do no seem to be necessary for the line
>   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
> ) then this needs to be special cased for Windows.
> 
> 
>>  M  +1 -1      kcal/libical/src/libical/icalcomponent.c
>>  M  +1 -1      kcal/libical/src/libical/icalmime.c
>>  M  +1 -1      kcal/libical/src/libical/icalrecur.c
>>  M  +0 -1      kcal/libical/src/libical/icaltimezone.c
>>  M  +3 -3      kcal/libical/src/libical/sspm.c
>>  M  +2 -1      kcal/libical/src/libical/vsnprintf.c
>>  M  +1 -1      kcal/libical/src/libicalss/icalcalendar.c
>>  M  +31 -30    kcal/libical/src/libicalss/icalclassify.c
>>  M  +9 -7      kcal/libical/src/libicalss/icaldirset.c
>>  M  +4 -2      kcal/libical/src/libicalss/icalfileset.c
>>  M  +1 -0      kcal/libical/src/libicalss/icalgauge.c
>>  M  +3 -0      kcal/libical/src/libicalss/icalmessage.c
>>  M  +1 -1      kcal/libical/src/libicalss/icalspanlist.c
> 
> 
> Regards,
> Ingo
Plz revert - we'll see if it still works on windows :)


Christian
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/