[ggt-checkins] SF.net SVN: ggt:[1277] trunk

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

Revision: 1277
          http://ggt.svn.sourceforge.net/ggt/?rev=1277&view=rev
Author:   patrickh
Date:     2011-04-23 22:05:31 +0000 (Sat, 23 Apr 2011)

Log Message:
-----------
Updated the build to require SCons 2.0 or newer.

Submitted by: Doug McCorkle

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/SConstruct

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-23 22:02:40 UTC (rev 1276)
+++ trunk/ChangeLog	2011-04-23 22:05:31 UTC (rev 1277)
@@ -1,5 +1,10 @@
 DATE       AUTHOR       CHANGE
 ---------- ------------ -------------------------------------------------------
+2011-04-23 patrickh     SCons 2.0 is now the minimum required version.
+                        Submitted by Doug McCorkle.
+2011-04-23 patrickh     GMTL installations can now be found using the CMake
+                        find_package command.
+                        Submitted by Johannes Zarl.
 2011-03-27 patrickh     Added an overload of gmtl::findClosestPt() for use with
                         gmtl::Tri<T> and gmtl::Point<T, 3>.
                         Submitted by Sebastian Messerschmidt

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2011-04-23 22:02:40 UTC (rev 1276)
+++ trunk/SConstruct	2011-04-23 22:05:31 UTC (rev 1277)
@@ -1,6 +1,6 @@
 #!python
 
-EnsureSConsVersion(0,96)
+EnsureSConsVersion(2,0)
 SConsignFile()
 
 import os, string, sys
@@ -223,10 +223,10 @@
 def BuildWin32Environment():
    global optimize, compiler_major_ver
 
-   if ARGUMENTS.has_key("MSVS_VERSION"):
+   if ARGUMENTS.has_key("MSVC_VERSION"):
       # Python extension modules can only be built using Visual C++ 7.1 or
       # 9.0.
-      msvs_ver = ARGUMENTS["MSVS_VERSION"]
+      msvs_ver = ARGUMENTS["MSVC_VERSION"]
       if msvs_ver not in ("7.1", "9.0"):
          print "Cannot build Python extensions using MSVS version %s" % \
                   msvs_ver
@@ -236,17 +236,18 @@
       if msvs_ver == "7.1" and python_ver not in ("2.4", "2.5"):
          print "Python 2.4 or 2.5 must be used with Visual C++ 7.1"
          sys.exit(1)
-      elif msvs_ver == "9.0" and python_ver not in ("2.6"):
+      elif msvs_ver == "9.0" and python_ver < ("2.6"):
          print "Python 2.6 must be used with Visual C++ 9.0"
          sys.exit(1)
 
-      env = Environment(MSVS_VERSION = msvs_ver)
+      env = Environment(MSVC_VERSION = msvs_ver)
       # Use the following line instead of the preceding when building with
       # Visual C++ 9.0. SCons does not know how to find the VC++ 9.0 paths.
       #env = Environment(MSVS_VERSION = msvs_ver, ENV = os.environ)
    else:
       env = Environment(ENV = os.environ)
 
+   env["MSVS"] = {"VERSION" : env["MSVC_VERSION"]}
    print "Using MSVS version:", env["MSVS"]["VERSION"]
    compiler_major_ver = env["MSVS"]["VERSION"]
    
@@ -636,7 +637,7 @@
 Export('baseEnv')
 
 options_cache = 'options.cache.' + distutils.util.get_platform()
-opts = Options(options_cache)
+opts = Variables(options_cache)
 AddCppUnitOptions(opts)
 AddPythonOptions(opts)
 AddBoostOptions(opts)


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