From f5b39e06780f8f95c77613a8f72e4baae4a1d4ba Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Tue, 27 Mar 2018 22:00:36 +0200
Subject: [PATCH] Updated settings

---
 SystemC-CCI/build.py     |  6 ++++--
 SystemC-CCI/conanfile.py | 10 ++--------
 SystemC/build.py         |  9 +++++++--
 SystemC/conanfile.py     |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/SystemC-CCI/build.py b/SystemC-CCI/build.py
index 94dd6a8..bd1e96e 100644
--- a/SystemC-CCI/build.py
+++ b/SystemC-CCI/build.py
@@ -5,7 +5,9 @@ if __name__ == "__main__":
     archs = ['x86', 'x86_64']
     types = ['Debug','Release']
     cxxstds = ['98','11','14']
-    configs = [[i,k] for i in cxxstds for k in types]
+    libstdcxx = ['libstdc++', 'libstdc++11']
+    #-s compiler.libcxx=libstdc++
+    configs = [[i,k,l] for i in cxxstds for k in types for l in libstdcxx]
     for triple in configs:
-        builder.add(settings={"build_type":triple[1]}, options={"stdcxx" : triple[0]}, env_vars={}, build_requires={})
+        builder.add(settings={"build_type":triple[1], "compiler.libcxx":triple[2]}, options={"stdcxx" : triple[0]}, env_vars={}, build_requires={})
     builder.run()
diff --git a/SystemC-CCI/conanfile.py b/SystemC-CCI/conanfile.py
index 7fee287..e14850b 100644
--- a/SystemC-CCI/conanfile.py
+++ b/SystemC-CCI/conanfile.py
@@ -28,9 +28,8 @@ class SystemC_CCIConan(ConanFile):
             env_build.cxx_flags = "-std=gnu++98"
         env_build.fpic = True
         with tools.chdir(os.path.join(self.source_subfolder, 'src')):
-            env_build.make(args=[
-                    'SYSTEMC_HOME=%s' % self.deps_cpp_info["SystemC"].rootpath
-                ])
+            env_build.make(args=[ 'clean', 'SYSTEMC_HOME=%s' % self.deps_cpp_info["SystemC"].rootpath])
+            env_build.make(args=[ 'AT_CXX=', 'SYSTEMC_HOME=%s' % self.deps_cpp_info["SystemC"].rootpath])
 
     def package(self):
         # Headers
@@ -40,11 +39,6 @@ class SystemC_CCIConan(ConanFile):
         # Libs
         lib_dir = os.path.join(self.source_subfolder, 'lib')
         self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
-        self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
-        self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
-        self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
-        self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
-        self.copy(pattern="*", dst="lib", src=lib_dir, keep_path=False)
 
     def package_info(self):
         self.cpp_info.libs = ["cciapi"]
diff --git a/SystemC/build.py b/SystemC/build.py
index bee3e5e..028550a 100644
--- a/SystemC/build.py
+++ b/SystemC/build.py
@@ -5,8 +5,13 @@ if __name__ == "__main__":
     archs = ['x86', 'x86_64']
     types = ['Debug','Release']
     cxxstds = ['98', '11','14']
+    libstdcxx = ['libstdc++', 'libstdc++11']
     shared = [True,False]
-    configs = [[i,k,s] for i in cxxstds for k in types for s in shared]
+    configs = [[i,k,l,s] for i in cxxstds for k in types for l in libstdcxx for s in shared]
     for triple in configs:
-        builder.add(settings={"build_type":triple[1]}, options={"stdcxx" : triple[0], "shared" : triple[2]}, env_vars={}, build_requires={})
+        builder.add(
+                settings={"build_type":triple[1],"compiler.libcxx":triple[2]},
+                options={"stdcxx" : triple[0], "shared" : triple[3]},
+                env_vars={},
+                build_requires={})
     builder.run()
diff --git a/SystemC/conanfile.py b/SystemC/conanfile.py
index f007a4a..a7d0261 100644
--- a/SystemC/conanfile.py
+++ b/SystemC/conanfile.py
@@ -27,7 +27,7 @@ class SystemCConan(ConanFile):
         cmake.build()
         cmake.install()
 
-    def package(self):
+    #def package(self):
         # Headers
         #self.copy(pattern="*.h", dst="include", src="package/include", keep_path=True)
         # Libs