Merge branch 'matthias_setuppy' into 'master'

Add ql build include dir to include the autogenerated headers

See merge request qs/oreswig!31

Author: rolandlichters

OREAnalytics-SWIG/Python/setup.py

@@ -137,17 +137,24 @@ def finalize_options(self):
 
             # ADD INCLUDE DIRECTORIES
             self.include_dirs.append(self.validate_path(BOOST_DIR))
+            self.include_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'QuantLib')))
             self.include_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'QuantLib')))
             self.include_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'QuantExt')))
             self.include_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'OREData')))
             self.include_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'OREAnalytics')))
 
             # ADD LIBRARY DIRECTORIES
+            
+            target = "Release"
+
+            if self.debug:
+                target = "Debug"
+
             self.library_dirs.append(self.validate_path(BOOST_LIB))
-            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'QuantLib', 'ql', 'Release')))
-            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'QuantExt', 'qle', 'Release')))
-            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'OREData', 'ored', 'Release')))
-            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'OREAnalytics', 'orea', 'Release')))
+            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'QuantLib', 'ql', target)))
+            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'QuantExt', 'qle', target)))
+            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'OREData', 'ored', target)))
+            self.library_dirs.append(self.validate_path(os.path.join(ORE_DIR, 'build', 'OREAnalytics', 'orea', target)))
 
             #if 'INCLUDE' in os.environ:
             #    dirs = [dir for dir in os.environ['INCLUDE'].split(';')]