Updated settings
This commit is contained in:
parent
878911f4e1
commit
f5b39e0678
|
@ -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()
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue