[QGIS Commit] r13734 - trunk/qgis/cmake

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Jun 14 13:58:53 EDT 2010


Author: jef
Date: 2010-06-14 17:58:53 +0000 (Mon, 14 Jun 2010)
New Revision: 13734

Modified:
   trunk/qgis/cmake/SIPMacros.cmake
Log:
fix initial sip binding creation on windows

Modified: trunk/qgis/cmake/SIPMacros.cmake
===================================================================
--- trunk/qgis/cmake/SIPMacros.cmake	2010-06-14 16:17:32 UTC (rev 13733)
+++ trunk/qgis/cmake/SIPMacros.cmake	2010-06-14 17:58:53 UTC (rev 13734)
@@ -85,20 +85,10 @@
         ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
-    IF(NOT WIN32)
-        SET(TOUCH_COMMAND touch)
-    ELSE(NOT WIN32)
-        SET(TOUCH_COMMAND echo)
-        # instead of a touch command, give out the name and append to the files
-        # this is basically what the touch command does.
-        FOREACH(filename ${_sip_output_files})
-            FILE(APPEND ${filename} "")
-        ENDFOREACH(filename ${_sip_output_files})
-    ENDIF(NOT WIN32)
     ADD_CUSTOM_COMMAND(
         OUTPUT ${_sip_output_files} 
         COMMAND ${CMAKE_COMMAND} -E echo ${message}
-        COMMAND ${TOUCH_COMMAND} ${_sip_output_files} 
+        COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} 
         COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
         DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
     )



More information about the QGIS-commit mailing list