[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/libkcal
From:       Allen Winter <winter () kde ! org>
Date:       2006-04-10 1:15:12
Message-ID: 1144631712.483250.27695.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 528074 by winterz:

generate icalss.h in a similar way as ical.h.



 M  +20 -46    CMakeLists.txt  
 M  +2 -2      ical_file.cmake  
 A             icalss_file.cmake  


--- trunk/KDE/kdepim/libkcal/CMakeLists.txt #528073:528074
@@ -89,8 +89,8 @@
 
 
 set(libversit_SRCS 
-	${CMAKE_SOURCE_DIR}/libkcal/versit/vcc.c 
-	${CMAKE_SOURCE_DIR}/libkcal/versit/vobject.c 
+   ${CMAKE_SOURCE_DIR}/libkcal/versit/vcc.c 
+   ${CMAKE_SOURCE_DIR}/libkcal/versit/vobject.c 
 )
 
 set(libical_SRCS
@@ -148,58 +148,32 @@
    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalmessage.h       
    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalsslexer.c           
    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalssyacc.c
-   )
+)
 
 
-macro_additional_clean_files( ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h \
) +macro_additional_clean_files(${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h)
  
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h 
-		COMMAND 
-		${CMAKE_COMMAND} 
-		-DTOP:FILEPATH=${CMAKE_SOURCE_DIR}
-		-DKDE_FILE_H_FILE:FILEPATH=${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h
-		-P ${CMAKE_SOURCE_DIR}/libkcal/ical_file.cmake )
+add_custom_command(OUTPUT
+   ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h 
+   COMMAND 
+   ${CMAKE_COMMAND} 
+   -DTOP:FILEPATH=${CMAKE_SOURCE_DIR}
+   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h
+   -P ${CMAKE_SOURCE_DIR}/libkcal/ical_file.cmake
+)
 
+macro_additional_clean_files(${CMAKE_SOURCE_DIR}/libical/src/libicalss/icalss.h)
 
-set(COMBINEDHEADERSICALSS
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalgauge.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalset.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalcluster.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalfileset.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icaldirset.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalcalendar.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalclassify.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalspanlist.h
-    ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalmessage.h
+add_custom_command(OUTPUT
+   ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalss.h 
+   COMMAND 
+   ${CMAKE_COMMAND} 
+   -DTOP:FILEPATH=${CMAKE_SOURCE_DIR}
+   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalss.h
 +   -P ${CMAKE_SOURCE_DIR}/libkcal/icalss_file.cmake
 )
 
-macro(CREATE_ICALSS_FILE _out_FILE)
-    FILE(WRITE ${_out_FILE} "#ifdef __cplusplus\n")
-    FILE(APPEND ${_out_FILE} "extern \"C\" {\n")
-    FILE(APPEND ${_out_FILE} "#endif\n")
-    FILE(APPEND ${_out_FILE} "/*\n")
-    FILE(APPEND ${_out_FILE} " $Id$\n")
-    FILE(APPEND ${_out_FILE} "*/\n")
-    foreach (_current_FILE ${COMBINEDHEADERSICALSS})
-        FILE(READ ${_current_FILE} _contents)
-    	STRING(REGEX REPLACE "#include *\"ical.*\\.h\"" "" _contents "${_contents}" )
-	    STRING(REGEX REPLACE "#include *\"pvl\\.h\"" "" _contents "${_contents}" )
-		
-		#STRING(REGEX REPLACE "\$$(Id|Locker): .+\$$" "" _contents "${_contents}" )
-        FILE(APPEND ${_out_FILE} "${_contents}")
-    endforeach (_current_FILE ${COMBINEDHEADERSICALSS})
-    FILE(APPEND ${_out_FILE} "\n")
-    FILE(APPEND ${_out_FILE} "#ifdef __cplusplus\n")
-    FILE(APPEND ${_out_FILE} "}\n")
-    FILE(APPEND ${_out_FILE} "#endif\n")
-endmacro(CREATE_ICALSS_FILE)
 
-macro_additional_clean_files( ${CMAKE_SOURCE_DIR}/libical/src/libicalss/icalss.h )
-
-create_icalss_file( ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalss.h )
-
-
-
 ########### next target ###############
 
 set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS} \
${CMAKE_SOURCE_DIR}/libkcal/libical/src/libicalss/icalss.h \
                ${CMAKE_SOURCE_DIR}/libkcal/libical/src/libical/ical.h
--- trunk/KDE/kdepim/libkcal/ical_file.cmake #528073:528074
@@ -1,5 +1,5 @@
-# ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
-# is required to make the combined header ical.h properly
+# ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering.
+# It is required to make the combined header ical.h properly.
 set(COMBINEDHEADERSICAL
    ${TOP}/libkcal/libical/src/libical/icalversion.h
    ${TOP}/libkcal/libical/src/libical/icaltime.h


[prev in list] [next in list] [prev in thread] [next in thread]