mirror of
				https://github.com/Minres/conan-recipes.git
				synced 2025-10-30 21:59:36 +00:00 
			
		
		
		
	Updated settings
This commit is contained in:
		| @@ -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"] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user