python_patch_QGIS_trunk.diff

Patch to fix compile problem on Mandriva (in QGIS trunk) - Markus Neteler, 2009-08-15 10:45 AM

Download (1020 Bytes)

View differences:

python/configure.py.in (working copy)
122 122 

  		




  123
  123
  
    
# common settings for both core and gui libs

  		




  124
  124
  
    
for mk in [ makefile_core, makefile_gui ]:

  		




  125
  
  
    
  mk.extra_lflags.extend( "@CMAKE_MODULE_LINKER_FLAGS@".strip(' ').split(' ') )

  		




  
  125
  
    
  mk.extra_lflags = ["@CMAKE_MODULE_LINKER_FLAGS@"]

  		




  126
  126
  
    
  mk.extra_libs = ["qgis_core"]

  		




  127
  127
  
    
  mk.extra_lib_dirs = [build_path+"/src/core"+intdir]

  		




  128
  128
  
    
  mk.extra_include_dirs = [src_path+"/src/core", src_path+"/src/core/composer", 

  		




  ......




  133
  133
  
    
                           build_path, # qgsconfig.h, qgssvnversion.h

  		




  134
  134
  
    
                           gdal_inc_dir,

  		




  135
  135
  
    
                           geos_inc_dir]

  		




  136
  
  
    
  mk.extra_cxxflags = ["-DCORE_EXPORT="+export]

  		




  
  136
  
    
  mk.extra_cxxflags = ["-DCORE_EXPORT="+export, "@CMAKE_CXX_FLAGS@"]

  		




  
  137
  
    
  mk.extra_libs.append("python"+sys.version[0:3])

  		




  137
  138
  
    

  		




  138
  139
  
    
# more settings for gui lib

  		




  139
  140
  
    
makefile_gui.extra_libs.append("qgis_gui")