configure.py.in.diff

vince -, 2009-04-29 01:39 AM

Download (1.69 KB)

View differences:

python/configure.py.in 2009-04-29 08:36:31.000000000 +0200
6 6

  
7 7
src_path = '@CMAKE_SOURCE_DIR@'
8 8
build_path = '@CMAKE_BINARY_DIR@'
9
install_path = '@CMAKE_INSTALL_PREFIX@'
9 10
python_path = src_path + '/python'
10 11
gdal_inc_dir = '@GDAL_INCLUDE_DIR@'
11 12
geos_inc_dir = '@GEOS_INCLUDE_DIR@'
......
18 19
if sys.platform == 'darwin':
19 20
  qt_libs.append("QtSql")
20 21
  # possibility of universal build of bindings
21
  osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
22
  if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
22
  osx_arch = '@CMAKE_OSX_ARCHITECTURES@'
23
  # Counts the number of archs given
24
  if osx_arch [-1] == ';' :
25
  	osx_arch = osx_arch [:-1]
26
  osx_archs = osx_arch. split (";")
27
  if len (osx_archs) > 1 :
23 28
    osx_universal = '@CMAKE_OSX_SYSROOT@'
24 29
  else:
25 30
    osx_universal = ''
......
126 131

  
127 132
# common settings for both core and gui libs
128 133
for mk in [ makefile_core, makefile_gui ]:
129
  mk.extra_libs = ["qgis_core"]
134
  mk.extra_lflags.append ("-dylib_file %s/python/core/libqgis_core.dylib:%s/lib/libqgis_core.dylib" % (build_path, install_path))
135
  mk.extra_libs = []
130 136
  if geos_library!="":
131 137
    mk.extra_libs.append(geos_library)
132 138
  if gdal_library!="":
......
147 154
  mk.extra_cxxflags = ["-DCORE_EXPORT="+export]
148 155

  
149 156
# more settings for gui lib
150
makefile_gui.extra_libs.append("qgis_gui")
157
makefile_gui.extra_lflags.append("-dylib_file %s/python/core/libqgis_gui.dylib:%s/lib/libqgis_gui.dylib" % (build_path, install_path))
151 158
makefile_gui.extra_lib_dirs.append(build_path+"/src/gui"+intdir)
152 159
makefile_gui.extra_include_dirs.append(src_path+"/src/gui")
153 160
makefile_gui.extra_include_dirs.append(build_path+"/src/gui")