sync

SConstruct

@@ -10,6 +10,8 @@ globalEnv['BUILDPATH'] = os.path.join(basicBuildPath, 'release')
 globalEnv['CONTRIBPATH'] = os.path.join(globalEnv['ROOTPATH'], 'contrib')
 globalEnv['MONGOCPATH'] = os.path.join(globalEnv['CONTRIBPATH'], 'mongoc')
 globalEnv['MONGOCXXPATH'] = os.path.join(globalEnv['CONTRIBPATH'], 'mongocxx')
+globalEnv['QBSCXXPATH'] = os.path.join(globalEnv['CONTRIBPATH'], 'qubosolver')
+
 globalEnv["INIHSRC"] = os.path.join(
 					   os.path.join(globalEnv["CONTRIBPATH"],
 								   "iniParser"), 
@@ -19,14 +21,29 @@ globalEnv["MINISATSRC"] = os.path.join(
 						   os.path.join(globalEnv["CONTRIBPATH"],
 									   "minisat"), 
 									   "src")
+globalEnv["QBSCXXSRC"] = os.path.join(
+                         os.path.join(
+                         os.path.join(globalEnv["CONTRIBPATH"],
+                                      "qubosolver"), 
+									  "qbscxx"),
+                                      "src")
+globalEnv["QBSCXX_INCLUDE"] = os.path.join(
+                              os.path.join(
+                              os.path.join(globalEnv["CONTRIBPATH"],
+                                           "qubosolver"), 
+                                           "qbscxx"),
+                                           "include")
 
 
 #compiler option
 AddOption('--dbg', action='store_true', dest='DEBUG')
 
+globalEnv["BUILD_TYPE"] = "Release"
+
 if GetOption('DEBUG'):
-	globalEnv.Append(CCFLAGS="-g")
-	globalEnv['BUILDPATH'] = os.path.join(basicBuildPath, 'debug')
+    globalEnv["BUILD_TYPE"] = "Debug"
+    globalEnv.Append(CCFLAGS="-g")
+    globalEnv['BUILDPATH'] = os.path.join(basicBuildPath, 'debug')
 
 globalEnv.Append(CXXFLAGS='-std=c++11')
 AddOption("--init", action="store_true", dest="INIT")
@@ -59,6 +76,18 @@ if GetOption("INIT"):
 						 variant_dir=globalEnv["MONGOCXX_LIB_PATH"],
 						 duplicate=0,
 						 exports="globalEnv")
+                         
+#build qbscxx
+globalEnv["QBSCXX_LIB_PATH"] = os.path.join(globalEnv["LIB_BUILD_PATH"], "qbscxx")
+
+if GetOption("INIT"):
+	globalEnv.SConscript(os.path.join(
+						 os.path.join(globalEnv["CONTRIBPATH"],
+									  "qubosolver"),
+									  "SConscript"),
+						 variant_dir=globalEnv["QBSCXX_LIB_PATH"],
+						 duplicate=0,
+						 exports="globalEnv")                         
 
 #build inih
 globalEnv["INIH_LIB_PATH"] = os.path.join(globalEnv["LIB_BUILD_PATH"], "inih")
@@ -96,7 +125,7 @@ bsoncxxIncludeDir = os.path.join(
 								"include"),
 								"bsoncxx"),
 								"v_noabi")
-
+                    
 inihIncludeDir = globalEnv["INIHSRC"]
 inihcppIncludeDir = globalEnv["INIHCPPSRC"]
 
@@ -106,11 +135,15 @@ globalEnv.Append(CPPPATH=[mongocxxIncludeDir,
 						  bsoncxxIncludeDir,
 						  inihIncludeDir,
 						  inihcppIncludeDir,
-						  minisatIncludeDir])
+						  minisatIncludeDir,
+						  globalEnv["QBSCXXSRC"],
+						  globalEnv["QBSCXX_INCLUDE"]])
+
 
 globalEnv.Append(LIBPATH=[os.path.join(globalEnv["MONGOCXX_LIB_PATH"], "lib"),
 						  globalEnv["INIH_LIB_PATH"],
-						  globalEnv["MINISAT_LIB_PATH"]])
+						  globalEnv["MINISAT_LIB_PATH"],
+						  globalEnv["QBSCXX_LIB_PATH"]])
 
 
 #build runMinisat