[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [626] trunk

[<pat...@us...>]

Revision: 626
          http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=626&view=rev
Author:   patrickh
Date:     2007-08-01 15:59:33 -0700 (Wed, 01 Aug 2007)

Log Message:
-----------
Avoid hard-coding compiler and linker flags in the .fpc file. Removed
hard-coded path quoting as it causes problems on non-Windows platforms. The
quoting is now done by the SConstruct file.

Modified Paths:
--------------
    trunk/SConstruct
    trunk/cppdom.fpc.in

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2007-08-01 15:37:52 UTC (rev 625)
+++ trunk/SConstruct	2007-08-01 22:59:33 UTC (rev 626)
@@ -145,6 +145,13 @@
    include_dir = pj(base_inst_paths['base'], 'include')
    base_inst_paths['includePrefix'] = pj( base_inst_paths['flagpollPrefix'], 'include')
 
+   if GetPlatform() == "win32":
+      base_inst_paths["include_path_flag"] = "/I"
+      base_inst_paths["lib_path_flag"]     = "/LIBPATH:"
+   else:
+      base_inst_paths["include_path_flag"] = "-I"
+      base_inst_paths["lib_path_flag"]     = "-L"
+
    if common_env['versioning']:
       version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
 
@@ -181,7 +188,11 @@
       if "debug" == combo["type"]:
          inst_paths["lib"] = pj(inst_paths["lib"],"debug")
          inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
-      
+
+      if GetPlatform() == 'win32':
+         inst_paths["libPrefix"] = '"%s"' % inst_paths["libPrefix"]
+         inst_paths["includePrefix"] = '"%s"' % inst_paths["includePrefix"]
+
       cppdom_shared_libname = 'cppdom' + shared_lib_suffix + version_suffix
       cppdom_static_libname = 'cppdom' + static_lib_suffix + version_suffix
       
@@ -240,10 +251,12 @@
          '@prefix@'                    : inst_paths['flagpollPrefix'],
          '@exec_prefix@'               : '${prefix}',
          '@cppdom_cxxflags@'           : cppdom_cxxflags,
+         '@include_path_flag@'         : inst_paths['include_path_flag'],
          '@includedir@'                : inst_paths['includePrefix'],
          '@cppdom_extra_cxxflags@'     : '',
          '@cppdom_extra_include_dirs@' : '',
          '@cppdom_libs@'               : cppdom_libs,
+         '@lib_path_flag@'             : inst_paths['lib_path_flag'],
          '@libdir@'                    : inst_paths['libPrefix'],
          '@arch@'                      : arch,
          '@version@'                   : cppdom_version_str

Modified: trunk/cppdom.fpc.in
===================================================================
--- trunk/cppdom.fpc.in	2007-08-01 15:37:52 UTC (rev 625)
+++ trunk/cppdom.fpc.in	2007-08-01 22:59:33 UTC (rev 626)
@@ -1,8 +1,8 @@
 exec_prefix=@exec_prefix@
 cxxflags=@cppdom_cxxflags@
-includedir=@includedir@
+includedir=@include_path_flag@@includedir@
 libs=@cppdom_libs@
-libdir=@libdir@
+libdir=@lib_path_flag@@libdir@
 
 Name: XML CppDom
 Provides: @provides@
@@ -10,7 +10,7 @@
 Description: A C++ based XML loader and writer with an internal DOM representation.
 URL: http://xml-cppdom.sf.net
 Requires:
-Libs: -L"${libdir}" ${libs}
-Cflags: -I"${includedir}"
+Libs: ${libdir} ${libs}
+Cflags: ${includedir}
 Arch: @arch@
 prefix: @prefix@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.